Improvements to create/edit user.

James Moger

2011-05-12 a098da747052eb8d9f612f78dece8ac027a72caa

 src/com/gitblit/GitBlit.java

@@ -95,10 +95,22 @@
      userCookie.setPath("/");

      response.addCookie(userCookie);

   }

	
   public List<String> getAllUsernames() {

      return loginService.getAllUsernames();

   }



   public UserModel getUser(String username) {

   public UserModel getUserModel(String username) {

      UserModel user = loginService.getUserModel(username);

      return user;

   }

	
   public List<String> getRepositoryUsers(RepositoryModel repository) {

      return loginService.getUsernamesForRole(repository.name);

   }

	
   public boolean setRepositoryUsers(RepositoryModel repository, List<String> repositoryUsers) {

      return loginService.setUsernamesForRole(repository.name, repositoryUsers);

   }



   public void editUserModel(UserModel user, boolean isCreate) throws GitBlitException {

@@ -140,7 +152,7 @@
   public RepositoryModel getRepositoryModel(UserModel user, String repositoryName) {

      RepositoryModel model = getRepositoryModel(repositoryName);

      if (model.accessRestriction.atLeast(AccessRestrictionType.VIEW)) {

         if (user != null && user.canView(model)) {

         if (user != null && user.canAccessRepository(model.name)) {

            return model;

         }

         return null;

@@ -161,7 +173,7 @@
         model.owner = config.getString("gitblit", null, "owner");

         model.useTickets = config.getBoolean("gitblit", "useTickets", false);

         model.useDocs = config.getBoolean("gitblit", "useDocs", false);

         model.accessRestriction = AccessRestrictionType.fromString(config.getString("gitblit", null, "accessRestriction"));

         model.accessRestriction = AccessRestrictionType.fromName(config.getString("gitblit", null, "accessRestriction"));

         model.showRemoteBranches = config.getBoolean("gitblit", "showRemoteBranches", false);

      }

      r.close();

@@ -195,7 +207,7 @@
      config.setString("gitblit", null, "owner", repository.owner);

      config.setBoolean("gitblit", null, "useTickets", repository.useTickets);

      config.setBoolean("gitblit", null, "useDocs", repository.useDocs);

      config.setString("gitblit", null, "accessRestriction", repository.accessRestriction.toString());

      config.setString("gitblit", null, "accessRestriction", repository.accessRestriction.name());

      config.setBoolean("gitblit", null, "showRemoteBranches", repository.showRemoteBranches);

      try {

         config.save();

@@ -206,7 +218,7 @@
   }



   public void configureContext(IStoredSettings settings) {

      logger.info("Configure GitBlit from " + settings.toString());

      logger.info("Using configuration from " + settings.toString());

      this.storedSettings = settings;

      repositoriesFolder = new File(settings.getString(Keys.git.repositoriesFolder, "repos"));

      exportAll = settings.getBoolean(Keys.git.exportAll, true);