Merge branch 'master' of https://github.com/Mrbytes/gitblit

James Moger

2012-10-13 c658df9e87d65b08d5482cf04489cb0532ff83dd

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

@@ -58,12 +58,13 @@
import com.gitblit.wicket.pages.ProjectPage;

import com.gitblit.wicket.pages.RepositoriesPage;

import com.gitblit.wicket.pages.SummaryPage;

import com.gitblit.wicket.pages.UserPage;



public class RepositoriesPanel extends BasePanel {



   private static final long serialVersionUID = 1L;



   public RepositoriesPanel(String wicketId, final boolean showAdmin,

   public RepositoriesPanel(String wicketId, final boolean showAdmin, final boolean showManagement,

         List<RepositoryModel> models, boolean enableLinks,

         final Map<AccessRestrictionType, String> accessRestrictionTranslations) {

      super(wicketId);

@@ -75,19 +76,31 @@


      final IDataProvider<RepositoryModel> dp;



      Fragment adminLinks = new Fragment("adminPanel", "adminLinks", this);

      adminLinks.add(new Link<Void>("clearCache") {

      Fragment managementLinks;

      if (showAdmin) {

         // user is admin

         managementLinks = new Fragment("managementPanel", "adminLinks", this);

         managementLinks.add(new Link<Void>("clearCache") {



         private static final long serialVersionUID = 1L;

            private static final long serialVersionUID = 1L;



         @Override

         public void onClick() {

            GitBlit.self().resetRepositoryListCache();

            setResponsePage(RepositoriesPage.class);

         }

      }.setVisible(GitBlit.getBoolean(Keys.git.cacheRepositoryList, true)));

      adminLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));

      add(adminLinks.setVisible(showAdmin));

            @Override

            public void onClick() {

               GitBlit.self().resetRepositoryListCache();

               setResponsePage(RepositoriesPage.class);

            }

         }.setVisible(GitBlit.getBoolean(Keys.git.cacheRepositoryList, true)));

         managementLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));

         add(managementLinks);

      } else if (showManagement && user != null && user.canCreate()) {

         // user can create personal repositories

         managementLinks = new Fragment("managementPanel", "personalLinks", this);

         managementLinks.add(new BookmarkablePageLink<Void>("newRepository", EditRepositoryPage.class));

         add(managementLinks);

      } else {

         // user has no management permissions

         add (new Label("managementPanel").setVisible(false));

      }



      if (GitBlit.getString(Keys.web.repositoryListType, "flat").equalsIgnoreCase("grouped")) {

         List<RepositoryModel> rootRepositories = new ArrayList<RepositoryModel>();

@@ -116,7 +129,7 @@
         }

                  

         Map<String, ProjectModel> projects = new HashMap<String, ProjectModel>();

         for (ProjectModel project : GitBlit.self().getProjectModels(user)) {

         for (ProjectModel project : GitBlit.self().getProjectModels(user, true)) {

            projects.put(project.name, project);

         }

         List<RepositoryModel> groupedModels = new ArrayList<RepositoryModel>();

@@ -138,7 +151,7 @@


      final String baseUrl = WicketUtils.getGitblitURL(getRequest());

      final boolean showSwatch = GitBlit.getBoolean(Keys.web.repositoryListSwatches, true);



		
      DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("row", dp) {

         private static final long serialVersionUID = 1L;

         int counter;

@@ -156,8 +169,19 @@
               currGroupName = entry.name;

               Fragment row = new Fragment("rowContent", "groupRepositoryRow", this);

               item.add(row);

               row.add(new LinkPanel("groupName", null, entry.toString(), ProjectPage.class, WicketUtils.newProjectParameter(entry.name)));

               row.add(new Label("groupDescription", entry.description == null ? "":entry.description));

					
               String name = entry.toString();

               if (name.charAt(0) == '~') {

                  // user page

                  String username = name.substring(1);

                  UserModel user = GitBlit.self().getUserModel(username);

                  row.add(new LinkPanel("groupName", null, user == null ? username : user.getDisplayName(), UserPage.class, WicketUtils.newUsernameParameter(username)));

                  row.add(new Label("groupDescription", getString("gb.personalRepositories")));

               } else {

                  // project page

                  row.add(new LinkPanel("groupName", null, name, ProjectPage.class, WicketUtils.newProjectParameter(entry.name)));

                  row.add(new Label("groupDescription", entry.description == null ? "":entry.description));

               }

               WicketUtils.setCssClass(item, "group");

               // reset counter so that first row is light background

               counter = 0;

@@ -212,6 +236,13 @@
                     .setEscapeModelStrings(false));

            }



            if (entry.isFork()) {

               row.add(WicketUtils.newImage("forkIcon", "commit_divide_16x16.png",

                     getString("gb.isFork")));

            } else {

               row.add(WicketUtils.newClearPixel("forkIcon").setVisible(false));

            }



            if (entry.useTickets) {

               row.add(WicketUtils.newImage("ticketsIcon", "bug_16x16.png",

                     getString("gb.tickets")));

@@ -259,7 +290,14 @@
               row.add(WicketUtils.newBlankImage("accessRestrictionIcon"));

            }



            row.add(new Label("repositoryOwner", entry.owner));

            String owner = entry.owner;

            if (!StringUtils.isEmpty(owner)) {

               UserModel ownerModel = GitBlit.self().getUserModel(owner);

               if (ownerModel != null) {

                  owner = ownerModel.getDisplayName();

               }

            }

            row.add(new Label("repositoryOwner", owner));



            String lastChange;

            if (entry.lastChange.getTime() == 0) {

@@ -271,8 +309,9 @@
            row.add(lastChangeLabel);

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



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

            if (showAdmin) {

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

            boolean myPersonalRepository = showOwner && entry.isUsersPersonalRepository(user.username);

            if (showAdmin || myPersonalRepository) {

               Fragment repositoryLinks = new Fragment("repositoryLinks",

                     "repositoryAdminLinks", this);

               repositoryLinks.add(new BookmarkablePageLink<Void>("editRepository",

@@ -285,11 +324,11 @@
                  @Override

                  public void onClick() {

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

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

                        if (dp instanceof SortableRepositoriesProvider) {

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

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

                        } else {

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

                           setResponsePage(getPage().getClass(), getPage().getPageParameters());

                        }

                     } else {

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