Merge branch 'ticket/238' into develop

James Moger

2015-02-26 3bddeebcebf197ed6f8f785b26fba02faebd5344

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

@@ -378,7 +378,7 @@
                        }

                        TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);

                        app().tickets().createNotifier().sendMailing(update);

                        setResponsePage(TicketsPage.class, getPageParameters());

                        redirectTo(TicketsPage.class, getPageParameters());

                     }

                  };

                  String css = TicketsUI.getStatusClass(item.getModel().getObject());

@@ -442,7 +442,7 @@
                        }

                        TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);

                        app().tickets().createNotifier().sendMailing(update);

                        setResponsePage(TicketsPage.class, getPageParameters());

                        redirectTo(TicketsPage.class, getPageParameters());

                     }

                  };

                  item.add(link);

@@ -487,7 +487,7 @@
                        }

                        TicketModel update = app().tickets().updateTicket(repository, ticket.number, change);

                        app().tickets().createNotifier().sendMailing(update);

                        setResponsePage(TicketsPage.class, getPageParameters());

                        redirectTo(TicketsPage.class, getPageParameters());

                     }

                  };

                  item.add(link);

@@ -566,7 +566,7 @@
                  change.vote(user.username);

               }

               app().tickets().updateTicket(repository, ticket.number, change);

               setResponsePage(TicketsPage.class, getPageParameters());

               redirectTo(TicketsPage.class, getPageParameters());

            }

         };

         add(link);

@@ -606,7 +606,7 @@
                  change.watch(user.username);

               }

               app().tickets().updateTicket(repository, ticket.number, change);

               setResponsePage(TicketsPage.class, getPageParameters());

               redirectTo(TicketsPage.class, getPageParameters());

            }

         };

         add(link);

@@ -1303,7 +1303,7 @@
      }

      TicketModel updatedTicket = app().tickets().updateTicket(getRepositoryModel(), ticket.number, change);

      app().tickets().createNotifier().sendMailing(updatedTicket);

      setResponsePage(TicketsPage.class, getPageParameters());

      redirectTo(TicketsPage.class, getPageParameters());

   }



   protected <X extends MarkupContainer> X setNewTarget(X x) {

@@ -1414,8 +1414,8 @@
                        GitBlitWebSession.get().cacheErrorMessage(msg);

                        logger.error(msg);

                     }



                     setResponsePage(TicketsPage.class, getPageParameters());

							
                     redirectTo(TicketsPage.class, getPageParameters());

                  }

               };

               mergePanel.add(mergeButton);