Gitblit devel
parent: 47bfbe3b | patch | commit | ignore whitespace
BUISSON Christian
2014-04-16 556a5853fb7145adc20b2e718eca2e921f3d7399 
Ajout du nom du repository sur la page "MyTickets".
2 files modified
94 ■■■■■ changed files
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html 86 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/MyTicketsPage.java 8 ●●●●● patch | view | raw | blame | history 
 src/main/java/com/gitblit/wicket/pages/MyTicketsPage.html


@@ -6,45 +6,53 @@




<body>


    <wicket:extend>


        <table>


            <span>Responsible Tickets</span>


            <tbody>


                <tr wicket:id="responsibleTickets">


                    <td><span wicket:id="ticketName"></span></td>


                    <td><span wicket:id="ticketDescription"></span></td>


                </tr>


            </tbody>


        </table>


		


        <table>


            <span>Author Tickets</span>


            <tbody>


                <tr wicket:id="authorTickets">


                    <td><span wicket:id="ticketName"></span></td>


                    <td><span wicket:id="ticketDescription"></span></td>


                </tr>


            </tbody>


        </table>


		


        <table>


            <span>Voted Tickets</span>


            <tbody>


                <tr wicket:id="votedTickets">


                    <td><span wicket:id="ticketName"></span></td>


                    <td><span wicket:id="ticketDescription"></span></td>


                </tr>


            </tbody>


        </table>


		


        <table>


            <span>Watched Tickets</span>


            <tbody>


                <tr wicket:id="watchedTickets">


                    <td><span wicket:id="ticketName"></span></td>


                    <td><span wicket:id="ticketDescription"></span></td>


                </tr>


            </tbody>


        </table>


        <div class="container">


            <div class="markdown" style="padding: 10px 0px 5px 0px;" wicket:id="myTicketsMessage">[my tickets message]</div>


			


            <table>


                <span>Responsible Tickets</span>


                <tbody>


                    <tr wicket:id="responsibleTickets">


                        <td><span wicket:id="repositoryName"></span></td>


                        <td><span wicket:id="ticketName"></span></td>


                        <td><span wicket:id="ticketDescription"></span></td>


                    </tr>


                </tbody>


            </table>


			


            <table>


                <span>Author Tickets</span>


                <tbody>


                    <tr wicket:id="authorTickets">


                        <td><span wicket:id="repositoryName"></span></td>


                        <td><span wicket:id="ticketName"></span></td>


                        <td><span wicket:id="ticketDescription"></span></td>


                    </tr>


                </tbody>


            </table>


			


            <table>


                <span>Voted Tickets</span>


                <tbody>


                    <tr wicket:id="votedTickets">


                        <td><span wicket:id="repositoryName"></span></td>


                        <td><span wicket:id="ticketName"></span></td>


                        <td><span wicket:id="ticketDescription"></span></td>


                    </tr>


                </tbody>


            </table>


			


            <table>


                <span>Watched Tickets</span>


                <tbody>


                    <tr wicket:id="watchedTickets">


                        <td><span wicket:id="repositoryName"></span></td>


                        <td><span wicket:id="ticketName"></span></td>


                        <td><span wicket:id="ticketDescription"></span></td>


                    </tr>


                </tbody>


            </table>


        </div>


    </wicket:extend>


</body>


</html>




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


@@ -3,6 +3,7 @@


import java.util.ArrayList;


import java.util.List;




import com.gitblit.Keys;


import com.gitblit.models.UserModel;


import com.gitblit.models.TicketModel;


import com.gitblit.tickets.ITicketService;


@@ -32,6 +33,9 @@


            currentUser = UserModel.ANONYMOUS;


        }


        String username = currentUser.getName();


		


        String message = "Welcome on GitBlit";


        this.add(new Label("myTicketsMessage", message));		


        


        ITicketService tickets = GitBlitWebApp.get().tickets();


        List<TicketModel> returnedTickets = tickets.getTickets(null);


@@ -73,6 +77,7 @@


            {


                final TicketModel ticket = item.getModelObject();


                String ticketUrl = app().tickets().getTicketUrl(ticket);


                item.add(new Label("repositoryName", ticket.repository));


                item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl));


                item.add(new Label("ticketDescription", ticket.body));


            }


@@ -87,6 +92,7 @@


            {


                final TicketModel ticket = item.getModelObject();


                String ticketUrl = app().tickets().getTicketUrl(ticket);


                item.add(new Label("repositoryName", ticket.repository));


                item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl));


                item.add(new Label("ticketDescription", ticket.body));


            }


@@ -101,6 +107,7 @@


            {


                final TicketModel ticket = item.getModelObject();


                String ticketUrl = app().tickets().getTicketUrl(ticket);


                item.add(new Label("repositoryName", ticket.repository));


                item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl));


                item.add(new Label("ticketDescription", ticket.body));


            }


@@ -115,6 +122,7 @@


            {


                final TicketModel ticket = item.getModelObject();


                String ticketUrl = app().tickets().getTicketUrl(ticket);


                item.add(new Label("repositoryName", ticket.repository));


                item.add(new LinkPanel("ticketName", "", ticket.title, ticketUrl));


                item.add(new Label("ticketDescription", ticket.body));


            }