aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStevan Radaković <stevan.radakovic@linaro.org>2013-03-28 12:48:52 +0100
committerStevan Radaković <stevan.radakovic@linaro.org>2013-03-28 12:48:52 +0100
commit1fcf4699040baf46a34fa1046514bbda7c3c275a (patch)
tree5dbc4976eab6bce782a170b460fc294e920a6029
parent011a244da0d1efd74db6caf487f51d8c0406a005 (diff)
Add user to group only if it's not default user.
-rw-r--r--rhodecode/model/repo.py3
-rw-r--r--rhodecode/model/repos_group.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
index 8bf6fd51..4cf041a8 100644
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -511,13 +511,14 @@ class RepoModel(BaseModel):
system_group_name = "%s-%s" % (repo.repo_name.rsplit("/",1)[0],
repo.repo_id)
- SystemCommand.add_user_to_group(system_group_name, user.username)
repo_path = os.path.join(self.repos_path, repo.repo_name)
if user.username=="default":
if permission.permission_name in ["group.none", "group.read"]:
os.chmod(repo_path, 0775)
else:
os.chmod(repo_path, 0777)
+ else:
+ SystemCommand.add_user_to_group(system_group_name, user.username)
def revoke_user_permission(self, repo, user):
"""
diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py
index 031237ae..d75c9a4e 100644
--- a/rhodecode/model/repos_group.py
+++ b/rhodecode/model/repos_group.py
@@ -368,13 +368,14 @@ class ReposGroupModel(BaseModel):
system_group_name = "%s-%s" % (repos_group.group_name.rsplit("/",1)[0],
repos_group.group_id)
- SystemCommand.add_user_to_group(system_group_name, user.username)
group_path = os.path.join(self.repos_path, repos_group.group_name)
if user.username=="default":
if permission.permission_name in ["group.none", "group.read"]:
os.chmod(group_path, 0775)
else:
os.chmod(group_path, 0777)
+ else:
+ SystemCommand.add_user_to_group(system_group_name, user.username)
def revoke_user_permission(self, repos_group, user):
"""