Forgot to commit UserModel with cookie field

James Moger

2012-07-11 a31cf95ac0787eb559cb78f48c52bc6b79e970d8

 src/com/gitblit/wicket/panels/RepositoriesPanel.java

@@ -49,7 +49,6 @@
import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

import com.gitblit.utils.TimeUtils;

import com.gitblit.wicket.GitBlitWebSession;

import com.gitblit.wicket.WicketUtils;

import com.gitblit.wicket.pages.BasePage;

@@ -155,7 +154,7 @@
               swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false);

            } else {

               swatch = new Label("repositorySwatch", "!");

               WicketUtils.setHtmlTooltip(swatch, "This repository has a working copy and can not receive pushes");

               WicketUtils.setHtmlTooltip(swatch, getString("gb.workingCopyWarning"));

            }

            WicketUtils.setCssBackground(swatch, entry.toString());

            row.add(swatch);

@@ -185,7 +184,7 @@
               row.add(new Label("repositorySize", entry.size).setVisible(showSize));

            } else {

               // New repository

               row.add(new Label("repositorySize", "<span class='empty'>(empty)</span>")

               row.add(new Label("repositorySize", "<span class='empty'>(" + getString("gb.empty") + ")</span>")

                     .setEscapeModelStrings(false));

            }



@@ -242,11 +241,11 @@
            if (entry.lastChange.getTime() == 0) {

               lastChange = "--";

            } else {

               lastChange = TimeUtils.timeAgo(entry.lastChange);

               lastChange = getTimeUtils().timeAgo(entry.lastChange);

            }

            Label lastChangeLabel = new Label("repositoryLastChange", lastChange);

            row.add(lastChangeLabel);

            WicketUtils.setCssClass(lastChangeLabel, TimeUtils.timeAgoCss(entry.lastChange));

            WicketUtils.setCssClass(lastChangeLabel, getTimeUtils().timeAgoCss(entry.lastChange));



            boolean showOwner = user != null && user.username.equalsIgnoreCase(entry.owner);

            if (showAdmin) {

@@ -262,20 +261,19 @@
                  @Override

                  public void onClick() {

                     if (GitBlit.self().deleteRepositoryModel(entry)) {

                        info(MessageFormat.format("Repository ''{0}'' deleted.", entry));

                        info(MessageFormat.format(getString("gb.repositoryDeleted"), entry));

                        if (dp instanceof SortableRepositoriesProvider) {

                           ((SortableRepositoriesProvider) dp).remove(entry);

                        } else {

                           ((RepositoriesProvider) dp).remove(entry);

                        }

                     } else {

                        error(MessageFormat.format("Failed to delete repository ''{0}''!",

                              entry));

                        error(MessageFormat.format(getString("gb.repositoryDeleteFailed"), entry));

                     }

                  }

               };

               deleteLink.add(new JavascriptEventConfirmation("onclick", MessageFormat.format(

                     "Delete repository \"{0}\"?", entry)));

                     getString("gb.deleteRepository"), entry)));

               repositoryLinks.add(deleteLink);

               row.add(repositoryLinks);

            } else if (showOwner) {