aboutsummaryrefslogtreecommitdiff
path: root/rhodecode/model/db.py
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2012-07-27 01:21:07 +0200
committerMarcin Kuzminski <marcin@python-works.com>2012-07-27 01:21:07 +0200
commitf1e780162df821489ed47b9e15d9041308789c61 (patch)
tree2414c785e7c1c80c26e3f427d685b236817dabae /rhodecode/model/db.py
parent7182ae959b769a50be98c1733296a79f2402f006 (diff)
merged + fixed pull request #62: Implemented metatags and visualisation options.
- new tag lang - fixed found issues - added simple test --HG-- branch : beta
Diffstat (limited to 'rhodecode/model/db.py')
-rwxr-xr-xrhodecode/model/db.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 5254d6cf..e7d04877 100755
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -182,9 +182,16 @@ class RhodeCodeSetting(Base, BaseModel):
)
@classmethod
- def get_by_name(cls, ldap_key):
+ def get_by_name(cls, key):
return cls.query()\
- .filter(cls.app_settings_name == ldap_key).scalar()
+ .filter(cls.app_settings_name == key).scalar()
+
+ @classmethod
+ def get_by_name_or_create(cls, key):
+ res = cls.get_by_name(key)
+ if not res:
+ res = cls(key)
+ return res
@classmethod
def get_app_settings(cls, cache=False):
@@ -589,8 +596,8 @@ class Repository(Base, BaseModel):
users_group_to_perm = relationship('UsersGroupRepoToPerm', cascade='all')
stats = relationship('Statistics', cascade='all', uselist=False)
- followers = relationship('UserFollowing',
- primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
+ followers = relationship('UserFollowing',
+ primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
cascade='all')
logs = relationship('UserLog')
@@ -1547,7 +1554,7 @@ class PullRequest(Base, BaseModel):
self._revisions = ':'.join(val)
author = relationship('User', lazy='joined')
- reviewers = relationship('PullRequestReviewers',
+ reviewers = relationship('PullRequestReviewers',
cascade="all, delete, delete-orphan")
org_repo = relationship('Repository', primaryjoin='PullRequest.org_repo_id==Repository.repo_id')
other_repo = relationship('Repository', primaryjoin='PullRequest.other_repo_id==Repository.repo_id')