diff --git a/rhodecode/controllers/admin/repos_groups.py b/rhodecode/controllers/admin/repos_groups.py
--- a/rhodecode/controllers/admin/repos_groups.py
+++ b/rhodecode/controllers/admin/repos_groups.py
@@ -74,11 +74,8 @@ class ReposGroupsController(BaseControll
:param group_id:
"""
self.__load_defaults()
-
repo_group = RepoGroup.get_or_404(group_id)
-
data = repo_group.get_dict()
-
data['group_name'] = repo_group.name
# fill repository users
@@ -179,7 +176,7 @@ class ReposGroupsController(BaseControll
h.flash(_('error occurred during update of repos group %s') \
% request.POST.get('group_name'), category='error')
- return redirect(url('repos_groups'))
+ return redirect(url('edit_repos_group', id=id))
@HasPermissionAnyDecorator('hg.admin')
def delete(self, id):
@@ -202,10 +199,11 @@ class ReposGroupsController(BaseControll
try:
ReposGroupModel().delete(id)
Session().commit()
- h.flash(_('removed repos group %s') % gr.group_name, category='success')
+ h.flash(_('removed repos group %s') % gr.group_name,
+ category='success')
#TODO: in future action_logger(, '', '', '', self.sa)
except IntegrityError, e:
- if e.message.find('groups_group_parent_id_fkey') != -1:
+ if str(e.message).find('groups_group_parent_id_fkey') != -1:
log.error(traceback.format_exc())
h.flash(_('Cannot delete this group it still contains '
'subgroups'),
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -994,6 +994,7 @@ class RepoGroup(Base, BaseModel):
group_name = Column("group_name", String(255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
group_description = Column("group_description", String(10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
+ enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
users_group_to_perm = relationship('UsersGroupRepoGroupToPerm', cascade='all')
@@ -1100,6 +1101,24 @@ class RepoGroup(Base, BaseModel):
return cnt + children_count(self)
+ def recursive_groups_and_repos(self):
+ """
+ Recursive return all groups, with repositories in those groups
+ """
+ all_ = []
+
+ def _get_members(root_gr):
+ for r in root_gr.repositories:
+ all_.append(r)
+ childs = root_gr.children.all()
+ if childs:
+ for gr in childs:
+ all_.append(gr)
+ _get_members(gr)
+
+ _get_members(self)
+ return [self] + all_
+
def get_new_name(self, group_name):
"""
returns new full group name based on parent and new name
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -127,7 +127,7 @@ def ReposGroupForm(edit=False, old_data=
group_parent_id = v.OneOf(available_groups, hideList=False,
testValueList=True,
if_missing=None, not_empty=False)
-
+ enable_locking = v.StringBoolean(if_missing=False)
chained_validators = [v.ValidReposGroup(edit, old_data),
v.ValidPerms('group')]
diff --git a/rhodecode/model/repos_group.py b/rhodecode/model/repos_group.py
--- a/rhodecode/model/repos_group.py
+++ b/rhodecode/model/repos_group.py
@@ -183,11 +183,20 @@ class ReposGroupModel(BaseModel):
repos_group.group_description = form_data['group_description']
repos_group.parent_group = RepoGroup.get(form_data['group_parent_id'])
repos_group.group_parent_id = form_data['group_parent_id']
+ repos_group.enable_locking = form_data['enable_locking']
repos_group.group_name = repos_group.get_new_name(form_data['group_name'])
new_path = repos_group.full_path
self.sa.add(repos_group)
+ # iterate over all members of this groups and set the locking !
+ # this can be potentially heavy operation
+
+ for obj in repos_group.recursive_groups_and_repos():
+ #set the value from it's parent
+ obj.enable_locking = repos_group.enable_locking
+ self.sa.add(obj)
+
# we need to get all repositories from this new group and
# rename them accordingly to new group path
for r in repos_group.repositories:
diff --git a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
--- a/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
+++ b/rhodecode/templates/admin/repos_groups/repos_groups_edit.html
@@ -60,8 +60,16 @@
<%include file="repos_group_edit_perms.html"/>
-
+
+
+
+
+
+ ${h.checkbox('enable_locking',value="True")}
+ ${_('Enable lock-by-pulling on group. This option will be applied to all other groups and repositories inside')}
+