Merge branch 'ticket/195' into develop

James Moger

2014-09-30 3513117364394110f6ae8d5264602f1e1a7fcf1f

Merge branch 'ticket/195' into develop

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

@@ -113,11 +113,11 @@
        return canonicalUrl;

    }



    protected void manualRedirect(Class<? extends BasePage> pageClass) {

        redirect(pageClass, null);

    protected void redirectTo(Class<? extends BasePage> pageClass) {

        redirectTo(pageClass, null);

    }



    protected void redirect(Class<? extends BasePage> pageClass, PageParameters parameters) {

    protected void redirectTo(Class<? extends BasePage> pageClass, PageParameters parameters) {

        String absoluteUrl = getCanonicalUrl(pageClass, parameters);

        getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));

    }


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

@@ -143,7 +143,7 @@
                }



                if (success && app().tickets().updateMilestone(getRepositoryModel(), tm, createdBy)) {

                    redirect(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));

                    redirectTo(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));

                } else {

                    // TODO error

                }


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

@@ -331,13 +331,13 @@
                    if (ticket != null) {

                        TicketNotifier notifier = app().tickets().createNotifier();

                        notifier.sendMailing(ticket);

                        redirect(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));

                        redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));

                    } else {

                        // TODO error

                    }

                } else {

                    // nothing to change?!

                    redirect(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));

                    redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));

                }

            }

        });


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

@@ -108,7 +108,7 @@
                if (milestone != null) {

                    milestone.due = due;

                    app().tickets().updateMilestone(getRepositoryModel(), milestone, createdBy);

                    redirect(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));

                    redirectTo(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));

                } else {

                    // TODO error

                }


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

@@ -223,7 +223,7 @@
                    TicketNotifier notifier = app().tickets().createNotifier();

                    notifier.sendMailing(ticket);



                    redirect(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));

                    redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));

                } else {

                    // TODO error

                }


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

@@ -280,12 +280,12 @@
                PageParameters params = getPageParameters();
                if (params == null) {
                    // redirect to this page
                    manualRedirect(getClass());
                    redirectTo(getClass());
                } else {
                    // Strip username and password and redirect to this page
                    params.remove("username");
                    params.remove("password");
                    redirect(getClass(), params);
                    redirectTo(getClass(), params);
                }
            }
        }