Mercurial > kallithea

changeset 3220:9e76876a0690 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Global permission update with "overwrite existing settings" shouldn't override private repositories. It's to confusing to users, and private repos should be always private
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 25 Jan 2013 00:13:01 +0100
parents 42d7ca49d073
children dd0ee9119aa9
files rhodecode/model/permission.py
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/model/permission.py	Thu Jan 24 22:41:53 2013 +0100
+++ b/rhodecode/model/permission.py	Fri Jan 25 00:13:01 2013 +0100
@@ -118,8 +118,11 @@
                 for r2p in self.sa.query(UserRepoToPerm)\
                                .filter(UserRepoToPerm.user == perm_user)\
                                .all():
-                    r2p.permission = _def
-                    self.sa.add(r2p)
+
+                    #don't reset PRIVATE repositories
+                    if r2p.repository.private is False:
+                        r2p.permission = _def
+                        self.sa.add(r2p)
 
             if form_result['overwrite_default_group'] == True:
                 _def_name = form_result['default_group_perm'].split('group.')[-1]