Implemented support for toggling User.canFork in Manager

James Moger

2012-10-03 f22a0633d08e38ac4bf92b5165a708e11b4d6598

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

@@ -46,6 +46,7 @@
import com.gitblit.GitBlit;

import com.gitblit.Keys;

import com.gitblit.SyndicationServlet;

import com.gitblit.models.ProjectModel;

import com.gitblit.models.RepositoryModel;

import com.gitblit.models.UserModel;

import com.gitblit.utils.StringUtils;

@@ -54,7 +55,10 @@
import com.gitblit.wicket.pages.BasePage;

import com.gitblit.wicket.pages.EditRepositoryPage;

import com.gitblit.wicket.pages.EmptyRepositoryPage;

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 {



@@ -73,6 +77,16 @@
      final IDataProvider<RepositoryModel> dp;



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

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



         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));



@@ -101,10 +115,20 @@
            roots.add(0, rootPath);

            groups.put(rootPath, rootRepositories);

         }

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

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

            projects.put(project.name, project);

         }

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

         for (String root : roots) {

            List<RepositoryModel> subModels = groups.get(root);

            groupedModels.add(new GroupRepositoryModel(root, subModels.size()));

            GroupRepositoryModel group = new GroupRepositoryModel(root, subModels.size());

            if (projects.containsKey(root)) {

               group.title = projects.get(root).title;

               group.description = projects.get(root).description;

            }

            groupedModels.add(group);

            Collections.sort(subModels);

            groupedModels.addAll(subModels);

         }

@@ -115,7 +139,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;

@@ -133,7 +157,19 @@
               currGroupName = entry.name;

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

               item.add(row);

               row.add(new Label("groupName", entry.toString()));

					
               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;

@@ -188,6 +224,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")));

@@ -235,7 +278,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) {

@@ -248,7 +298,8 @@
            WicketUtils.setCssClass(lastChangeLabel, getTimeUtils().timeAgoCss(entry.lastChange));



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

            if (showAdmin) {

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

            if (showAdmin || myPersonalRepository) {

               Fragment repositoryLinks = new Fragment("repositoryLinks",

                     "repositoryAdminLinks", this);

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

@@ -261,11 +312,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));

@@ -315,6 +366,7 @@
      private static final long serialVersionUID = 1L;



      int count;

      String title;



      GroupRepositoryModel(String name, int count) {

         super(name, "", "", new Date(0));

@@ -323,7 +375,7 @@


      @Override

      public String toString() {

         return name + " (" + count + ")";

         return StringUtils.isEmpty(title) ? name  : title + " (" + count + ")";

      }

   }