diff options
author | Marcin Kuzminski <marcin@python-works.com> | 2012-07-15 03:14:58 +0200 |
---|---|---|
committer | Marcin Kuzminski <marcin@python-works.com> | 2012-07-15 03:14:58 +0200 |
commit | d92021a8661f0b540e1012c885beb34c621ae5de (patch) | |
tree | 0eb0f75d0e1ebbcd42e8e02be11cdc21e48abca2 /rhodecode/model/db.py | |
parent | 463078b909ad732bfbd9d56a3bd4bdf50073088e (diff) |
Added option to close pull requests, in future that will be close & merge
--HG--
branch : beta
Diffstat (limited to 'rhodecode/model/db.py')
-rwxr-xr-x | rhodecode/model/db.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py index ba859b72..dd1a72e0 100755 --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -1519,6 +1519,7 @@ class PullRequest(Base, BaseModel): description = Column('description', UnicodeText(10240), nullable=True) status = Column('status', Unicode(256), nullable=False, default=STATUS_NEW) created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now) + updated_on = Column('updated_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now) user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None) _revisions = Column('revisions', UnicodeText(20500)) # 500 revisions max org_repo_id = Column('org_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False) @@ -1526,6 +1527,8 @@ class PullRequest(Base, BaseModel): other_repo_id = Column('other_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False) other_ref = Column('other_ref', Unicode(256), nullable=False) + statuses = relationship('ChangesetStatus') + @hybrid_property def revisions(self): return self._revisions.split(':') @@ -1539,6 +1542,9 @@ class PullRequest(Base, BaseModel): org_repo = relationship('Repository', primaryjoin='PullRequest.org_repo_id==Repository.repo_id') other_repo = relationship('Repository', primaryjoin='PullRequest.other_repo_id==Repository.repo_id') + def is_closed(self): + return self.status == self.STATUS_CLOSED + def __json__(self): return dict( revisions=self.revisions |