Pass in old groups data to CanWriteToGroup validator for later skipping group checks.

This will be a part of refactoring done to do user permissions changes without messing with main
repo form data

rhodecode/controllers/admin/repos.py

@@ -239,8 +239,10 b' class ReposController(BaseRepoController'
         #override the choices with extracted revisions !
         choices, c.landing_revs = ScmModel().get_repo_landing_revs(repo_name)
         c.landing_revs_choices = choices
-
-        _form = RepoForm(edit=True, old_data={'repo_name': repo_name},
+        repo = Repository.get_by_repo_name(repo_name)
+        _form = RepoForm(edit=True, old_data={'repo_name': repo_name,
+                                              'repo_group': repo.group.get_dict() \
+                                              if repo.group else {}},
                          repo_groups=c.repo_groups_choices,
                          landing_revs=c.landing_revs_choices)()
         try:

rhodecode/controllers/settings.py

@@ -109,9 +109,11 b' class SettingsController(BaseRepoControl'
         #override the choices with extracted revisions !
         choices, c.landing_revs = ScmModel().get_repo_landing_revs(repo_name)
         c.landing_revs_choices = choices
-
+        repo = Repository.get_by_repo_name(repo_name)
         _form = RepoSettingsForm(edit=True,
-                                 old_data={'repo_name': repo_name},
+                                old_data={'repo_name': repo_name,
+                                          'repo_group': repo.group.get_dict() \
+                                              if repo.group else {}},
                                  repo_groups=c.repo_groups_choices,
                                  landing_revs=c.landing_revs_choices)()
         try:

rhodecode/model/forms.py

@@ -182,7 +182,7 b' def RepoForm(edit=False, old_data={}, su'
         filter_extra_fields = False
         repo_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                         v.SlugifyName())
-        repo_group = All(v.CanWriteGroup(),
+        repo_group = All(v.CanWriteGroup(old_data),
                          v.OneOf(repo_groups, hideList=True))
         repo_type = v.OneOf(supported_backends)
         repo_description = v.UnicodeString(strip=True, min=1, not_empty=False)
@@ -227,7 +227,7 b' def RepoSettingsForm(edit=False, old_dat'
         filter_extra_fields = False
         repo_name = All(v.UnicodeString(strip=True, min=1, not_empty=True),
                         v.SlugifyName())
-        repo_group = All(v.CanWriteGroup(),
+        repo_group = All(v.CanWriteGroup(old_data),
                          v.OneOf(repo_groups, hideList=True))
         repo_description = v.UnicodeString(strip=True, min=1, not_empty=False)
         repo_private = v.StringBoolean(if_missing=False)

rhodecode/model/validators.py

@@ -16,6 +16,7 b' from formencode.validators import ('
 from rhodecode.lib.compat import OrderedSet
 from rhodecode.lib import ipaddr
 from rhodecode.lib.utils import repo_name_slug
+from rhodecode.lib.utils2 import safe_int
 from rhodecode.model.db import RepoGroup, Repository, UserGroup, User,\
     ChangesetStatus
 from rhodecode.lib.exceptions import LdapImportError
@@ -472,7 +473,7 b' def ValidForkType(old_data={}):'
     return _validator
 
 
-def CanWriteGroup():
+def CanWriteGroup(old_data=None):
     class _validator(formencode.validators.FancyValidator):
         messages = {
             'permission_denied': _(u"You don't have permissions "
@@ -493,18 +494,20 b' def CanWriteGroup():'
             val = HasReposGroupPermissionAny('group.write', 'group.admin')
             can_create_repos = HasPermissionAny('hg.admin', 'hg.create.repository')
             forbidden = not val(gr_name, 'can write into group validator')
-            #parent group need to be existing
-            if gr and forbidden:
-                msg = M(self, 'permission_denied', state)
-                raise formencode.Invalid(msg, value, state,
-                    error_dict=dict(repo_type=msg)
-                )
-            ## check if we can write to root location !
-            elif gr is None and can_create_repos() is False:
-                msg = M(self, 'permission_denied_root', state)
-                raise formencode.Invalid(msg, value, state,
-                    error_dict=dict(repo_type=msg)
-                )
+            value_changed = True  # old_data['repo_group'].get('group_id') != safe_int(value)
+            if value_changed:  # do check if we changed the value
+                #parent group need to be existing
+                if gr and forbidden:
+                    msg = M(self, 'permission_denied', state)
+                    raise formencode.Invalid(msg, value, state,
+                        error_dict=dict(repo_type=msg)
+                    )
+                ## check if we can write to root location !
+                elif gr is None and can_create_repos() is False:
+                    msg = M(self, 'permission_denied_root', state)
+                    raise formencode.Invalid(msg, value, state,
+                        error_dict=dict(repo_type=msg)
+                    )
 
     return _validator