Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/panels/CommentPanel.java

@@ -15,18 +15,20 @@
 */
package com.gitblit.wicket.panels;

import org.apache.wicket.PageParameters;
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.Form;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.request.target.basic.RedirectRequestTarget;

import com.gitblit.models.RepositoryModel;
import com.gitblit.models.TicketModel;
import com.gitblit.models.TicketModel.Change;
import com.gitblit.models.UserModel;
import com.gitblit.wicket.SafeTextModel;
import com.gitblit.wicket.SafeTextModel.Mode;
import com.gitblit.wicket.WicketUtils;
import com.gitblit.wicket.pages.BasePage;

@@ -80,7 +82,7 @@
               TicketModel updatedTicket = app().tickets().updateTicket(repository, ticket.number, newComment);
               if (updatedTicket != null) {
                  app().tickets().createNotifier().sendMailing(updatedTicket);
                  setResponsePage(pageClass, WicketUtils.newObjectParameter(updatedTicket.repository, "" + ticket.number));
                  redirectTo(pageClass, WicketUtils.newObjectParameter(updatedTicket.repository, "" + ticket.number));
               } else {
                  error("Failed to add comment!");
               }
@@ -88,9 +90,27 @@
               // TODO update comment
            }
         }
			
            /**
             * Steal from BasePage to realize redirection.
             * 
             * @see BasePage
             * @author krulls@GitHub; ECG Leipzig GmbH, Germany, 2015
             * 
             * @param pageClass
             * @param parameters
             * @return
             */
            private void redirectTo(Class<? extends BasePage> pageClass, PageParameters parameters)
            {
                String relativeUrl = urlFor(pageClass, parameters).toString();
                String canonicalUrl = RequestUtils.toAbsolutePath(relativeUrl);
                getRequestCycle().setRequestTarget(new RedirectRequestTarget(canonicalUrl));
            }
			
      }.setVisible(ticket != null && ticket.number > 0));

      final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none);
      final IModel<String> markdownPreviewModel = Model.of();
      markdownPreview = new Label("markdownPreview", markdownPreviewModel);
      markdownPreview.setEscapeModelStrings(false);
      markdownPreview.setOutputMarkupId(true);