Mercurial > kallithea
changeset 2769:52617fb79010 beta
typos+docs.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sat, 01 Sep 2012 21:06:51 +0200 |
| parents | 850b2dfe2c7a |
| children | 74364824c1e1 |
| files | rhodecode/controllers/pullrequests.py rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py |
| diffstat | 2 files changed, 37 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/pullrequests.py Sat Sep 01 20:56:53 2012 +0200 +++ b/rhodecode/controllers/pullrequests.py Sat Sep 01 21:06:51 2012 +0200 @@ -195,13 +195,16 @@ pull_request = PullRequest.get_or_404(pull_request_id) if pull_request.is_closed(): raise HTTPForbidden() - - reviewers_ids = map(int, filter(lambda v: v not in [None, ''], - request.POST.get('reviewers_ids', '').split(','))) + #only owner or admin can update it + owner = pull_request.author.user_id == c.rhodecode_user.user_id + if h.HasPermissionAny('hg.admin', 'repository.admin')() or owner: + reviewers_ids = map(int, filter(lambda v: v not in [None, ''], + request.POST.get('reviewers_ids', '').split(','))) - PullRequestModel().update_reviewers(pull_request_id, reviewers_ids) - Session.commit() - return True + PullRequestModel().update_reviewers(pull_request_id, reviewers_ids) + Session.commit() + return True + raise HTTPForbidden() @NotAnonymous() @jsonify @@ -214,8 +217,7 @@ h.flash(_('Successfully deleted pull request'), category='success') return redirect(url('admin_settings_my_account')) - else: - raise HTTPForbidden() + raise HTTPForbidden() def _load_compare_data(self, pull_request, enable_comments=True): """
--- a/rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py Sat Sep 01 20:56:53 2012 +0200 +++ b/rhodecode/lib/dbmigrate/versions/006_version_1_4_0.py Sat Sep 01 21:06:51 2012 +0200 @@ -68,17 +68,7 @@ col.alter(index=Index('u_email_idx', 'email')) col.alter(name="firstname", table=tbl) - inherit_default_permissions = Column("users_group_inherit_default_permission", - Boolean(), nullable=True, unique=None, - default=True) - inherit_default_permissions.create(table=tbl) - inherit_default_permissions.alter(nullable=False, default=True, table=tbl) - - #========================================================================== - # GROUPS TABLE - #========================================================================== - from rhodecode.lib.dbmigrate.schema.db_1_3_0 import RepoGroup - tbl = RepoGroup.__table__ + # add inherit_default_permission column inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=True, unique=None, default=True) @@ -86,20 +76,36 @@ inherit_default_permissions.alter(nullable=False, default=True, table=tbl) #========================================================================== + # USERS GROUP TABLE + #========================================================================== + from rhodecode.lib.dbmigrate.schema.db_1_3_0 import UsersGroup + tbl = UsersGroup.__table__ + # add inherit_default_permission column + gr_inherit_default_permissions = Column( + "users_group_inherit_default_permissions", + Boolean(), nullable=True, unique=None, + default=True) + gr_inherit_default_permissions.create(table=tbl) + gr_inherit_default_permissions.alter(nullable=False, default=True, table=tbl) + + #========================================================================== # REPOSITORIES #========================================================================== from rhodecode.lib.dbmigrate.schema.db_1_3_0 import Repository tbl = Repository.__table__ + # add enable locking column enable_locking = Column("enable_locking", Boolean(), nullable=True, unique=None, default=False) enable_locking.create(table=tbl) enable_locking.alter(nullable=False, default=False, table=tbl) + # add locked column _locked = Column("locked", String(255), nullable=True, unique=False, default=None) _locked.create(table=tbl) + #add langing revision column landing_rev = Column("landing_revision", String(255), nullable=True, unique=False, default='tip') landing_rev.create(table=tbl) @@ -110,6 +116,8 @@ #========================================================================== from rhodecode.lib.dbmigrate.schema.db_1_3_0 import RepoGroup tbl = RepoGroup.__table__ + + # add enable locking column enable_locking = Column("enable_locking", Boolean(), nullable=True, unique=None, default=False) enable_locking.create(table=tbl) @@ -121,7 +129,7 @@ from rhodecode.lib.dbmigrate.schema.db_1_3_0 import CacheInvalidation tbl = CacheInvalidation.__table__ - # change column name -> firstname + # add INDEX for cache keys col = CacheInvalidation.__table__.columns.cache_key col.alter(index=Index('key_idx', 'cache_key')) @@ -131,7 +139,7 @@ from rhodecode.lib.dbmigrate.schema.db_1_3_0 import Notification tbl = Notification.__table__ - # change column name -> firstname + # add index for notification type col = Notification.__table__.columns.type col.alter(index=Index('notification_type_idx', 'type'),) @@ -141,21 +149,26 @@ from rhodecode.lib.dbmigrate.schema.db_1_3_0 import ChangesetComment tbl = ChangesetComment.__table__ + col = ChangesetComment.__table__.columns.revision - col = ChangesetComment.__table__.columns.revision + # add index for revisions col.alter(index=Index('cc_revision_idx', 'revision'),) + # add hl_lines column hl_lines = Column('hl_lines', Unicode(512), nullable=True) hl_lines.create(table=tbl) + # add created_on column created_on = Column('created_on', DateTime(timezone=False), nullable=True, default=datetime.datetime.now) created_on.create(table=tbl) created_on.alter(nullable=False, default=datetime.datetime.now) + modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now) modified_at.alter(type=DateTime(timezone=False), table=tbl) + # add FK to pull_request pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)