kallithea Changeset - 8a40028eaf73

Changeset - 8a40028eaf73

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-04-10 18:03:11
marcin@python-works.com

fixed overwrite default user group permission flag

2 files changed with 12 insertions and 1 deletions:

rhodecode/model/forms.py

rhodecode/model/permission.py

0 comments (0 inline, 0 general)

rhodecode/model/forms.py

➞

Show inline comments

@@ @@ -319,6 +319,7 @@ def DefaultPermissionsForm(repo_perms_ch @@
         filter_extra_fields = True
         overwrite_default_repo = v.StringBoolean(if_missing=False)
         overwrite_default_group = v.StringBoolean(if_missing=False)
         overwrite_default_user_group = v.StringBoolean(if_missing=False)
         anonymous = v.StringBoolean(if_missing=False)
         default_repo_perm = v.OneOf(repo_perms_choices)
         default_group_perm = v.OneOf(group_perms_choices)

rhodecode/model/permission.py

➞

Show inline comments

@@ @@ -30,7 +30,7 @@ from sqlalchemy.exc import DatabaseError @@
 from rhodecode.model import BaseModel
 from rhodecode.model.db import User, Permission, UserToPerm, UserRepoToPerm,\
     UserRepoGroupToPerm
+    UserRepoGroupToPerm, UserUserGroupToPerm
 from rhodecode.lib.utils2 import str2bool
 log = logging.getLogger(__name__)
@@ @@ -145,6 +145,16 @@ class PermissionModel(BaseModel): @@
                     g2p.permission = _def
                     self.sa.add(g2p)
             if form_result['overwrite_default_user_group'] == True:
                 _def_name = form_result['default_user_group_perm'].split('usergroup.')[-1]
                 # groups
                 _def = Permission.get_by_key('usergroup.' + _def_name)
                 for g2p in self.sa.query(UserUserGroupToPerm)\
                                .filter(UserUserGroupToPerm.user == perm_user)\
                                .all():
                     g2p.permission = _def
                     self.sa.add(g2p)
             self.sa.commit()
         except (DatabaseError,):
             log.error(traceback.format_exc())

0 comments (0 inline, 0 general)