kallithea Changeset - a62af7d509ee

Changeset - a62af7d509ee

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 15 years ago 2011-07-19 17:10:34
marcin@python-works.com

fixes #228 - added detection of assigned groups to prevent errors on sqlite

4 files changed with 23 insertions and 1 deletions:

rhodecode/controllers/admin/users_groups.py

rhodecode/lib/exceptions.py

rhodecode/model/db.py

rhodecode/model/users_group.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/users_groups.py

➞

Show inline comments

@@ @@ -32,6 +32,7 @@ from pylons import request, session, tmp @@
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
 from rhodecode.lib.exceptions import UsersGroupsAssignedException
 from rhodecode.lib import helpers as h
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
@@ @@ -153,6 +154,8 @@ class UsersGroupsController(BaseControll @@
         try:
             users_group_model.delete(id)
             h.flash(_('successfully deleted users group'), category='success')
         except UsersGroupsAssignedException, e:
             h.flash(e, category='error')
         except Exception:
             h.flash(_('An error occurred during deletion of users group'),
                     category='error')

rhodecode/lib/exceptions.py

➞

Show inline comments

@@ @@ -45,3 +45,6 @@ class DefaultUserException(Exception): @@
 class UserOwnsReposException(Exception):
     pass
 class UsersGroupsAssignedException(Exception):
     pass

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -286,6 +286,8 @@ class UsersGroup(Base, BaseModel): @@
     members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
     def __repr__(self):
         return '<userGroup(%s)>' % (self.users_group_name)
     @classmethod
     def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
@@ @@ -677,6 +679,8 @@ class UsersGroupRepoToPerm(Base, BaseMod @@
     permission = relationship('Permission')
     repository = relationship('Repository')
     def __repr__(self):
         return '<userGroup:%s => %s >' % (self.users_group, self.repository)
 class UsersGroupToPerm(Base, BaseModel):
     __tablename__ = 'users_group_to_perm'

rhodecode/model/users_group.py

➞

Show inline comments

@@ @@ -28,9 +28,11 @@ import traceback @@
 from pylons.i18n.translation import _
 from rhodecode.lib.exceptions import UsersGroupsAssignedException
 from rhodecode.model import BaseModel
 from rhodecode.model.caching_query import FromCache
 from rhodecode.model.db import UsersGroup, UsersGroupMember
 from rhodecode.model.db import UsersGroup, UsersGroupMember, \
     UsersGroupRepoToPerm
 log = logging.getLogger(__name__)
@@ @@ -84,6 +86,16 @@ class UsersGroupModel(BaseModel): @@
     def delete(self, users_group_id):
         try:
             # check if this group is not assigned to repo
             assigned_groups = UsersGroupRepoToPerm.query()\
                 .filter(UsersGroupRepoToPerm.users_group_id ==
                         users_group_id).all()
             if assigned_groups:
                 raise UsersGroupsAssignedException('Group assigned to %s' %
                                                    assigned_groups)
             users_group = self.get(users_group_id, cache=False)
             self.sa.delete(users_group)
             self.sa.commit()

0 comments (0 inline, 0 general)