Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

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

@@ -19,7 +19,9 @@


import org.apache.wicket.PageParameters;

import org.apache.wicket.RestartResponseException;

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

import org.apache.wicket.ajax.AjaxRequestTarget;

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

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;

@@ -29,7 +31,10 @@
import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.tickets.TicketMilestone;

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;



/**

@@ -43,16 +48,16 @@
   private IModel<String> nameModel;



   private IModel<Date> dueModel;

	


   public NewMilestonePage(PageParameters params) {

      super(params);



      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();

      if (currentUser == null) {

         currentUser = UserModel.ANONYMOUS;

@@ -60,50 +65,63 @@


      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);

      setOutputMarkupId(true);



      Form<Void> form = new Form<Void>("editForm") {

      Form<Void> form = new Form<Void>("editForm");

      add(form);



      nameModel = Model.of("");

      dueModel = Model.of(new Date(System.currentTimeMillis() + TimeUtils.ONEDAY));



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

      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;



         @Override

         protected void onSubmit() {

				
         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;

            }



            Date due = dueModel.getObject();



            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

            }

         }

      };

      add(form);

      });



      nameModel = Model.of("");

      dueModel = Model.of(new Date());

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

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



      form.add(new Button("create"));

      Button cancel = new Button("cancel") {

         private static final long serialVersionUID = 1L;



         @Override

         public void onSubmit() {

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

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

         }

      };

      cancel.setDefaultFormProcessing(false);