Mercurial > kallithea
changeset 2063:d9ba58526712 beta
fixed #373 missing cascade drop on user_group_to_perm table
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 28 Feb 2012 19:18:35 +0200 |
| parents | bf8ed0adbc66 |
| children | c9adf2a4929a |
| files | docs/changelog.rst rhodecode/controllers/admin/users_groups.py rhodecode/model/db.py |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/changelog.rst Tue Feb 28 18:25:30 2012 +0200 +++ b/docs/changelog.rst Tue Feb 28 19:18:35 2012 +0200 @@ -24,7 +24,7 @@ - fixes #366 When Setting Repository Group To Blank Repo Group Wont Be Moved To Root - fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys - +- fixed #373 missing cascade drop on user_group_to_perm table 1.3.1 (**2012-02-27**) ----------------------
--- a/rhodecode/controllers/admin/users_groups.py Tue Feb 28 18:25:30 2012 +0200 +++ b/rhodecode/controllers/admin/users_groups.py Tue Feb 28 19:18:35 2012 +0200 @@ -160,11 +160,12 @@ try: UsersGroupModel().delete(id) + Session.commit() h.flash(_('successfully deleted users group'), category='success') - Session.commit() except UsersGroupsAssignedException, e: h.flash(e, category='error') except Exception: + log.error(traceback.format_exc()) h.flash(_('An error occurred during deletion of users group'), category='error') return redirect(url('users_groups'))
--- a/rhodecode/model/db.py Tue Feb 28 18:25:30 2012 +0200 +++ b/rhodecode/model/db.py Tue Feb 28 19:18:35 2012 +0200 @@ -400,7 +400,7 @@ return datetime.date(*self.action_date.timetuple()[:3]) user = relationship('User') - repository = relationship('Repository',cascade='') + repository = relationship('Repository', cascade='') class UsersGroup(Base, BaseModel): @@ -412,6 +412,7 @@ users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None) members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined") + users_group_to_perm = relationship('UsersGroupToPerm', cascade='all') def __repr__(self): return '<userGroup(%s)>' % (self.users_group_name)