Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java

@@ -21,7 +21,7 @@
import org.apache.wicket.RestartResponseException;

import org.apache.wicket.ajax.AjaxRequestTarget;

import org.apache.wicket.ajax.markup.html.form.AjaxButton;

import org.apache.wicket.extensions.markup.html.form.DateTextField;

import org.apache.wicket.markup.html.basic.Label;

import org.apache.wicket.markup.html.form.Button;

import org.apache.wicket.markup.html.form.Form;

import org.apache.wicket.markup.html.form.TextField;

@@ -34,6 +34,7 @@
import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TimeUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.Html5DateField;

import com.gitblit.wicket.WicketUtils;



/**

@@ -54,7 +55,7 @@
      RepositoryModel model = getRepositoryModel();

      if (!app().tickets().isAcceptingTicketUpdates(model)) {

         // ticket service is read-only

         throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName));

         throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));

      }



      UserModel currentUser = GitBlitWebSession.get().getUser();

@@ -64,7 +65,7 @@


      if (!currentUser.isAuthenticated || !currentUser.canAdmin(model)) {

         // administration prohibited

         throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName));

         throw new RestartResponseException(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));

      }



      setStatelessHint(false);

@@ -77,8 +78,10 @@
      dueModel = Model.of(new Date(System.currentTimeMillis() + TimeUtils.ONEDAY));



      form.add(new TextField<String>("name", nameModel));

      form.add(new DateTextField("due", dueModel, "yyyy-MM-dd"));



      form.add(new Html5DateField("due", dueModel, "yyyy-MM-dd"));

      form.add(new Label("dueFormat", "yyyy-MM-dd"));

      addBottomScriptInline("{var e=document.createElement('input');e.type='date';if(e.type=='date'){$('[name=\"due\"]~.help-inline').hide()}}");

      addBottomScript("scripts/wicketHtml5Patch.js");

      form.add(new AjaxButton("create") {



         private static final long serialVersionUID = 1L;

@@ -87,6 +90,13 @@
         protected void onSubmit(AjaxRequestTarget target, Form<?> form) {

            String name = nameModel.getObject();

            if (StringUtils.isEmpty(name)) {

               // invalid name

               return;

            }



            TicketMilestone milestone = app().tickets().getMilestone(getRepositoryModel(), name);

            if (milestone != null) {

               // milestone already exists

               return;

            }



@@ -95,11 +105,11 @@
            UserModel currentUser = GitBlitWebSession.get().getUser();

            String createdBy = currentUser.username;



            TicketMilestone milestone = app().tickets().createMilestone(getRepositoryModel(), name, createdBy);

            milestone = app().tickets().createMilestone(getRepositoryModel(), name, createdBy);

            if (milestone != null) {

               milestone.due = due;

               app().tickets().updateMilestone(getRepositoryModel(), milestone, createdBy);

               throw new RestartResponseException(TicketsPage.class, WicketUtils.newRepositoryParameter(getRepositoryModel().name));

               redirectTo(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));

            } else {

               // TODO error

            }

@@ -111,7 +121,7 @@


         @Override

         public void onSubmit() {

            setResponsePage(TicketsPage.class, WicketUtils.newRepositoryParameter(repositoryName));

            setResponsePage(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));

         }

      };

      cancel.setDefaultFormProcessing(false);