]> source.dussan.org Git - gitblit.git/commitdiff
Change My Tickets repository link to the repository tickets page
authorJames Moger <james.moger@gitblit.com>
Fri, 2 May 2014 20:09:55 +0000 (16:09 -0400)
committerJames Moger <james.moger@gitblit.com>
Fri, 2 May 2014 20:09:55 +0000 (16:09 -0400)
src/main/java/com/gitblit/wicket/panels/TicketListPanel.html
src/main/java/com/gitblit/wicket/panels/TicketListPanel.java

index 6e6d2091745a3440055d8632f643bdc26c3c1b2d..30f503670d9df6663a3943e645c0755928c6d626 100644 (file)
@@ -22,7 +22,7 @@
                                <span wicket:id="indicators" style="white-space:nowrap;"><i wicket:id="icon"></i> <span style="padding-right:10px;" wicket:id="count"></span></span>\r
                        </div>\r
                        <div class="hidden-phone" wicket:id="updated"></div>\r
-                       <div class="ticket-list-details"><span class="activitySwatch" wicket:id="repositoryLink">[repository link]</span></div>\r
+                       <div class="ticket-list-details"><span class="activitySwatch" wicket:id="ticketsLink">[tickets link]</span></div>\r
                </td>\r
                <td class="ticket-list-state">\r
                                <span class="badge badge-info" wicket:id="votes"></span>\r
index fc0431fbb6e6fe316f8cafae986d24cdc272538c..395200c1fe012f1c002430348dd65fe55229a806 100644 (file)
@@ -32,6 +32,7 @@ import com.gitblit.Constants;
 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;
@@ -40,7 +41,6 @@ import com.gitblit.wicket.GitBlitWebSession;
 import com.gitblit.wicket.TicketsUI;
 import com.gitblit.wicket.TicketsUI.Indicator;
 import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.pages.SummaryPage;
 import com.gitblit.wicket.pages.TicketsPage;
 import com.gitblit.wicket.pages.UserPage;
 
@@ -73,16 +73,19 @@ public class TicketListPanel extends BasePanel {
                                        WicketUtils.setCssStyle(item, MessageFormat.format("border-left: 2px solid {0};", color));
                                }
 
-                               PageParameters rp = WicketUtils.newRepositoryParameter(ticket.repository);
                                PageParameters tp = WicketUtils.newObjectParameter(ticket.repository, "" + ticket.number);
 
                                if (showRepository) {
                                        String name = StringUtils.stripDotGit(ticket.repository);
-                                       LinkPanel link = new LinkPanel("repositoryLink", null, name, SummaryPage.class, rp);
+                                       PageParameters rp = new PageParameters(WicketUtils.newRepositoryParameter(ticket.repository));
+                                       for (String state : TicketsUI.openStatii) {
+                                               rp.add(Lucene.status.name(), state);
+                                       }
+                                       LinkPanel link = new LinkPanel("ticketsLink", null, name, TicketsPage.class, rp);
                                        WicketUtils.setCssBackground(link, name);
                                        item.add(link);
                                } else {
-                                       item.add(new Label("repositoryLink").setVisible(false));
+                                       item.add(new Label("ticketsLink").setVisible(false));
                                }
 
                                item.add(TicketsUI.getStateIcon("state", ticket.type, ticket.status));