diff options
Diffstat (limited to 'rhodecode/model/repos_group.py')
| -rw-r--r-- | rhodecode/model/repos_group.py | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py index c8a5639c..b739d588 100644 --- a/rhodecode/model/repos_group.py +++ b/rhodecode/model/repos_group.py @@ -43,6 +43,7 @@ log = logging.getLogger(__name__) class ReposGroupModel(BaseModel): cls = RepoGroup + URL_SEPARATOR = RepoGroup.url_sep() def __get_users_group(self, users_group): return self._get_instance(UsersGroup, users_group, @@ -142,8 +143,9 @@ class ReposGroupModel(BaseModel): group.name) shutil.move(rm_path, os.path.join(self.repos_path, _d)) - system_group_name = "%s-%s" % (group.group_name.rsplit("/",1)[1], - group.group_id) + system_group_name = "%s-%s" % ( + group.group_name.split(self.URL_SEPARATOR)[-1], + group.group_id) SystemCommand.delete_group(system_group_name) def create(self, group_name, group_description, parent=None, just_db=False): @@ -163,8 +165,9 @@ class ReposGroupModel(BaseModel): self.__create_group(new_repos_group.group_name) # Create corresponding system group. - system_group_name = "%s-%s" % (group_name.rsplit("/",1)[1], - new_repos_group.group_id) + system_group_name = "%s-%s" % ( + group_name.split(self.URL_SEPARATOR)[-1], + new_repos_group.group_id) SystemCommand.add_group(system_group_name) create_path = os.path.join(self.repos_path, group_name) os.chmod(create_path, 0775) @@ -281,10 +284,12 @@ class ReposGroupModel(BaseModel): self.__rename_group(old_path, new_path) - old_system_name = "%s-%s" % (old_path.rsplit("/",1)[1], - repos_group.group_id) - new_system_name = "%s-%s" % (new_path.rsplit("/",1)[1], - repos_group.group_id) + old_system_name = "%s-%s" % ( + old_path.split(self.URL_SEPARATOR)[-1], + repos_group.group_id) + new_system_name = "%s-%s" % ( + new_path.split(self.URL_SEPARATOR)[-1], + repos_group.group_id) SystemCommand.rename_group(old_system_name, new_system_name) return repos_group @@ -369,8 +374,9 @@ class ReposGroupModel(BaseModel): self.sa.add(obj) log.debug('Granted perm %s to %s on %s' % (perm, user, repos_group)) - system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[1], - repos_group.group_id) + system_group_name = "%s-%s" % ( + repos_group.group_name.split(self.URL_SEPARATOR)[-1], + repos_group.group_id) group_path = os.path.join(self.repos_path, repos_group.group_name) if permission.permission_name in ["group.none", "group.read"]: @@ -406,8 +412,9 @@ class ReposGroupModel(BaseModel): self.sa.delete(obj) log.debug('Revoked perm on %s on %s' % (repos_group, user)) - system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[1], - repos_group.group_id) + system_group_name = "%s-%s" % ( + repos_group.group_name.split(self.URL_SEPARATOR)[-1], + repos_group.group_id) SystemCommand.remove_user_from_group(system_group_name, user.username) def grant_users_group_permission(self, repos_group, group_name, perm): @@ -441,8 +448,9 @@ class ReposGroupModel(BaseModel): self.sa.add(obj) log.debug('Granted perm %s to %s on %s' % (perm, group_name, repos_group)) - system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[1], - repos_group.group_id) + system_group_name = "%s-%s" % ( + repos_group.group_name.split(self.URL_SEPARATOR)[-1], + repos_group.group_id) for user in group_name.members: if permission.permission_name in ["group.none", "group.read"]: @@ -472,8 +480,9 @@ class ReposGroupModel(BaseModel): self.sa.delete(obj) log.debug('Revoked perm to %s on %s' % (repos_group, group_name)) - system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[1], - repos_group.group_id) + system_group_name = "%s-%s" % ( + repos_group.group_name.split(self.URL_SEPARATOR)[-1], + repos_group.group_id) for user in group_name.members: SystemCommand.remove_user_from_group(system_group_name, user.username) |