Prepare v1.6.1 documentation updates

James Moger

2014-10-20 8a8bc3dc1bc810cef952a12071b6ec7dd8ff9750

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

@@ -32,7 +32,6 @@
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.tickets.QueryResult;
import com.gitblit.tickets.TicketIndexer.Lucene;
import com.gitblit.tickets.TicketLabel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.BugtraqProcessor;
@@ -65,11 +64,10 @@
         @Override
         protected void populateItem(Item<QueryResult> item) {
            final QueryResult ticket = item.getModelObject();
            final RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository);

            if (showSwatch) {
               // set repository color
               String color = StringUtils.getColor(StringUtils.stripDotGit(repository.name));
               String color = StringUtils.getColor(StringUtils.stripDotGit(ticket.repository));
               WicketUtils.setCssStyle(item, MessageFormat.format("border-left: 2px solid {0};", color));
            }

@@ -77,10 +75,7 @@

            if (showRepository) {
               String name = StringUtils.stripDotGit(ticket.repository);
               PageParameters rp = new PageParameters(WicketUtils.newRepositoryParameter(ticket.repository));
               for (String state : TicketsUI.openStatii) {
                  rp.add(Lucene.status.name(), state);
               }
               PageParameters rp =  WicketUtils.newOpenTicketsParameter(ticket.repository);
               LinkPanel link = new LinkPanel("ticketsLink", null, name, TicketsPage.class, rp);
               WicketUtils.setCssBackground(link, name);
               item.add(link);
@@ -125,13 +120,25 @@

               @Override
               public void populateItem(final Item<String> labelItem) {
                  BugtraqProcessor btp  = new BugtraqProcessor(app().settings());
                  Repository db = app().repositories().getRepository(repository.name);
                  String content = btp.processPlainCommitMessage(db, repository.name, labelItem.getModelObject());
                  db.close();
                  Label label = new Label("label", content);
                  label.setEscapeModelStrings(false);
                  TicketLabel tLabel = app().tickets().getLabel(repository, labelItem.getModelObject());
                  RepositoryModel repository = app().repositories().getRepositoryModel(ticket.repository);
                  Label label;
                  TicketLabel tLabel;
                  if (repository == null) {
                     label = new Label("label", labelItem.getModelObject());
                     tLabel = new TicketLabel(labelItem.getModelObject());
                  } else {
                     Repository db = app().repositories().getRepository(repository.name);
                     BugtraqProcessor btp  = new BugtraqProcessor(app().settings());
                     String content = btp.processText(db, repository.name, labelItem.getModelObject());
                     String safeContent = app().xssFilter().relaxed(content);
                     db.close();

                     label = new Label("label", safeContent);
                     label.setEscapeModelStrings(false);

                     tLabel = app().tickets().getLabel(repository, labelItem.getModelObject());
                  }

                  String background = MessageFormat.format("background-color:{0};", tLabel.color);
                  label.add(new SimpleAttributeModifier("style", background));
                  labelItem.add(label);