Mercurial > kallithea
diff rhodecode/controllers/admin/repos_groups.py @ 2749:3ed4dae499d0 beta
Recursive set locking on all children of a group.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Tue, 28 Aug 2012 00:17:42 +0200 |
parents | 91c442a489bb |
children | c0cc8f8a71b0 |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/repos_groups.py Mon Aug 27 23:33:43 2012 +0200 +++ b/rhodecode/controllers/admin/repos_groups.py Tue Aug 28 00:17:42 2012 +0200 @@ -74,11 +74,8 @@ :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 @@ 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 @@ 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'),