From c599bd17342d7019c68cd6dbea48c0b27efebd38 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 08 Sep 2014 18:06:09 -0400 Subject: [PATCH] Fix repository deletion bug where the Lucene ticket index was not purged --- src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html | 70 ++++++----------------------------- 1 files changed, 12 insertions(+), 58 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html index 9ecc4b6..b0bc194 100644 --- a/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html +++ b/src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html @@ -7,19 +7,20 @@ <body> <wicket:extend> <div class="container"> - <div class="row" style="padding-top:15px;min-height:500px;" > <div class="tab-pane active" id="tickets"> <!-- query controls --> <div class="span3"> <div class="hidden-phone"> - <div> - <div style="display:inline-block;vertical-align:top;padding-right:2px;"><img wicket:id="userGravatar"></img></div> - <div style="display:inline-block;"> - <div style="font-size:1.5em;" wicket:id="userDisplayName"></div> - <div style="color:#888;font-size:1.2em;"><wicket:message key="gb.mytickets"></wicket:message></div> + <div wicket:id="userTitlePanel"></div> + + <!-- search tickets form --> + <form class="form-search" style="margin: 10px 0px;" wicket:id="ticketSearchForm"> + <div class="input-append"> + <input type="text" class="input-medium search-query" style="border-radius: 14px 0 0 14px; padding-left: 14px;" id="ticketSearchBox" wicket:id="ticketSearchBox" value=""/> + <button class="btn" style="border-radius: 0 14px 14px 0px;margin-left:-5px;" type="submit"><i class="icon-search"></i></button> </div> - </div> + </form> <!-- query list --> <ul class="nav nav-list"> @@ -31,19 +32,13 @@ <li><a wicket:id="questionsQuery"><i class="fa fa-question"></i> <wicket:message key="gb.questionTickets"></wicket:message></a></li> <li wicket:id="userDivider" class="divider"></li> <li><a wicket:id="createdQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourCreatedTickets"></wicket:message></a></li> + <li><a wicket:id="responsibleQuery"><i class="fa fa-user"></i> <wicket:message key="gb.yourAssignedTickets"></wicket:message></a></li> <li><a wicket:id="watchedQuery"><i class="fa fa-eye"></i> <wicket:message key="gb.yourWatchedTickets"></wicket:message></a></li> <li><a wicket:id="mentionsQuery"><i class="fa fa-comment"></i> <wicket:message key="gb.mentionsMeTickets"></wicket:message></a></li> <li class="divider"></li> <li><a wicket:id="resetQuery"><i class="fa fa-bolt"></i> <wicket:message key="gb.reset"></wicket:message></a></li> </ul> - <!-- search tickets form --> - <form class="form-search" style="margin: 0px;" wicket:id="ticketSearchForm"> - <div class="input-append"> - <input type="text" class="search-query" style="width: 170px;border-radius: 14px 0 0 14px; padding-left: 14px;" id="ticketSearchBox" wicket:id="ticketSearchBox" value=""/> - <button class="btn" style="border-radius: 0 14px 14px 0px;margin-left:-5px;" type="submit"><i class="icon-search"></i></button> - </div> - </form> </div> </div> @@ -77,54 +72,13 @@ </div> </div> </div> - <table class="table tickets"> - <tbody> - <tr wicket:id="row"> - <td class="ticket-list-icon"> - <i wicket:id="state"></i> - </td> - <td> - <span wicket:id="title">[title]</span> <span wicket:id="labels" style="font-weight: normal;color:white;"><span class="label" wicket:id="label"></span></span> - <div class="ticket-list-details"> - <span style="padding-right: 10px;" class="hidden-phone"> - <wicket:message key="gb.createdBy"></wicket:message> - <span style="padding: 0px 2px" wicket:id="createdBy">[createdBy]</span> <span class="date" wicket:id="createDate">[create date]</span> - </span> - <span wicket:id="indicators" style="white-space:nowrap;"><i wicket:id="icon"></i> <span style="padding-right:10px;" wicket:id="count"></span></span> - </div> - <div class="hidden-phone" wicket:id="updated"></div> - <div class="ticket-list-details" wicket:id="repositoryLink">[repository link]</div> - </td> - <td class="ticket-list-state"> - <span class="badge badge-info" wicket:id="votes"></span> - </td> - <td class="hidden-phone ticket-list-state"> - <i wicket:message="title:gb.watching" style="color:#888;" class="fa fa-eye" wicket:id="watching"></i> - </td> - <td class="ticket-list-state"> - <div wicket:id="status"></div> - </td> - <td class="indicators"> - <div> - <b>#<span wicket:id="id">[id]</span></b> - </div> - <div wicket:id="responsible"></div> - </td> - </tr> - </tbody> - </table> + + <div wicket:id="ticketList"></div> </div> </div> </div> </div> - -<wicket:fragment wicket:id="updatedFragment"> - <div class="ticket-list-details"> - <wicket:message key="gb.updatedBy"></wicket:message> - <span style="padding: 0px 2px" wicket:id="updatedBy">[updatedBy]</span> <span class="date" wicket:id="updateDate">[update date]</span> - </div> -</wicket:fragment> - + </wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1