Merged #181 "Sanitize ticket text at presentation time to avoid unintended ...

James Moger

2014-09-17 802a6b05e5850161f740366cb59a182a96abe069

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

@@ -50,8 +50,6 @@
import com.gitblit.tickets.TicketResponsible;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.SafeTextModel;

import com.gitblit.wicket.SafeTextModel.Mode;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.panels.MarkdownTextArea;



@@ -112,8 +110,8 @@
      }



      typeModel = Model.of(ticket.type);

      titleModel = SafeTextModel.none(ticket.title);

      topicModel = SafeTextModel.none(ticket.topic == null ? "" : ticket.topic);

      titleModel = Model.of(ticket.title);

      topicModel = Model.of(ticket.topic == null ? "" : ticket.topic);

      responsibleModel = Model.of();

      milestoneModel = Model.of();

      mergeToModel = Model.of(ticket.mergeTo == null ? getRepositoryModel().mergeTo : ticket.mergeTo);

@@ -136,7 +134,7 @@
      form.add(new TextField<String>("title", titleModel));

      form.add(new TextField<String>("topic", topicModel));



      final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none);

      final IModel<String> markdownPreviewModel = Model.of(ticket.body == null ? "" : ticket.body);

      descriptionPreview = new Label("descriptionPreview", markdownPreviewModel);

      descriptionPreview.setEscapeModelStrings(false);

      descriptionPreview.setOutputMarkupId(true);