Replaced three history placeholder labels with real links.

James Moger

2011-04-16 01bd346efe98af0f05f23f897c0819d2df8d856c

 src/com/gitblit/wicket/pages/TicGitTicketPage.java

@@ -8,11 +8,12 @@
import org.eclipse.jgit.lib.Repository;



import com.gitblit.utils.JGitUtils;

import com.gitblit.utils.TicGitTicket;

import com.gitblit.utils.TicGitTicket.Comment;

import com.gitblit.utils.StringUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.RepositoryPage;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.models.TicGitTicket;

import com.gitblit.wicket.models.TicGitTicket.Comment;



public class TicGitTicketPage extends RepositoryPage {



@@ -26,13 +27,12 @@


      add(new Label("ticketTitle", t.title));

      add(new Label("ticketId", t.id));

      add(new Label("ticketHandler", t.handler));

      String openDate = GitBlitWebSession.get().formatDateTimeLong(t.date);

      add(new Label("ticketOpenDate", openDate));

      add(new Label("ticketHandler", t.handler.toLowerCase()));

      add(WicketUtils.createTimestampLabel("ticketOpenDate", t.date, getTimeZone()));

      Label stateLabel = new Label("ticketState", t.state);

      WicketUtils.setTicketCssClass(stateLabel, t.state);

      add(stateLabel);

      add(new Label("ticketTags", WicketUtils.flattenStrings(t.tags)));

      add(new Label("ticketTags", StringUtils.flattenStrings(t.tags)));



      ListDataProvider<Comment> commentsDp = new ListDataProvider<Comment>(t.comments);

      DataView<Comment> commentsView = new DataView<Comment>("comment", commentsDp) {

@@ -42,7 +42,7 @@
         public void populateItem(final Item<Comment> item) {

            final Comment entry = item.getModelObject();

            item.add(WicketUtils.createDateLabel("commentDate", entry.date, GitBlitWebSession.get().getTimezone()));

            item.add(new Label("commentAuthor", entry.author));

            item.add(new Label("commentAuthor", entry.author.toLowerCase()));

            item.add(new Label("commentText", prepareComment(entry.text)).setEscapeModelStrings(false));

            WicketUtils.setAlternatingBackground(item, counter);

            counter++;

@@ -50,14 +50,15 @@
      };

      add(commentsView);

   }

	


   @Override

   protected String getPageName() {

      return getString("gb.ticket");

   }



   private String prepareComment(String comment) {

      String html = WicketUtils.breakLines(comment).trim();

      String html = StringUtils.escapeForHtml(comment, false);

      html = StringUtils.breakLinesForHtml(comment).trim();

      return html.replaceAll("\\bcommit\\s*([A-Za-z0-9]*)\\b", "<a href=\"/commit/" + repositoryName + "/$1\">commit $1</a>");

   }

}