kallithea: rhodecode/model/db.py annotate

annotate rhodecode/model/db.py @ 2995:32471bd1f4ee beta

Implemented generation of changesets based on whole diff instead of per file diff. That can give a big speed improvement for large changesets in repositories with large history. - improved handling of binary files - show renames of binary files - implemented new diff limit functionality - unify diff generation between hg and git - Added binary indicators for changed files, - added diff lib tests

author	Marcin Kuzminski <marcin@python-works.com>
date	Mon, 05 Nov 2012 19:57:29 +0100
parents	78227b65a358
children	023f7873ef59

rev	line source
759 a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	1 # -- coding: utf-8 --
a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	2 """
832 634596f81cfd new improved models with helper functions for easier data fetching Marcin Kuzminski <marcin@python-works.com> parents: 810 diff changeset	3 rhodecode.model.db
634596f81cfd new improved models with helper functions for easier data fetching Marcin Kuzminski <marcin@python-works.com> parents: 810 diff changeset	4 ~~~~~~~~~~~~~~~~~~
1203 6832ef664673 source code cleanup: remove trailing white space, normalize file endings Marcin Kuzminski <marcin@python-works.com> parents: 1199 diff changeset	5
834 8924ed0e4f36 added current db version into rhodecode, Marcin Kuzminski <marcin@python-works.com> parents: 832 diff changeset	6 Database Models for RhodeCode
1203 6832ef664673 source code cleanup: remove trailing white space, normalize file endings Marcin Kuzminski <marcin@python-works.com> parents: 1199 diff changeset	7
759 a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	8 :created_on: Apr 08, 2010
a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	9 :author: marcink
1824 89efedac4e6c 2012 copyrights Marcin Kuzminski <marcin@python-works.com> parents: 1819 diff changeset	10 :copyright: (C) 2010-2012 Marcin Kuzminski <marcin@python-works.com>
759 a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	11 :license: GPLv3, see COPYING for more details.
a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	12 """
1206 a671db5bdd58 fixed license issue #149 Marcin Kuzminski <marcin@python-works.com> parents: 1203 diff changeset	13 # This program is free software: you can redistribute it and/or modify
a671db5bdd58 fixed license issue #149 Marcin Kuzminski <marcin@python-works.com> parents: 1203 diff changeset	14 # it under the terms of the GNU General Public License as published by
a671db5bdd58 fixed license issue #149 Marcin Kuzminski <marcin@python-works.com> parents: 1203 diff changeset	15 # the Free Software Foundation, either version 3 of the License, or
a671db5bdd58 fixed license issue #149 Marcin Kuzminski <marcin@python-works.com> parents: 1203 diff changeset	16 # (at your option) any later version.
1203 6832ef664673 source code cleanup: remove trailing white space, normalize file endings Marcin Kuzminski <marcin@python-works.com> parents: 1199 diff changeset	17 #
759 a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	18 # This program is distributed in the hope that it will be useful,
a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	19 # but WITHOUT ANY WARRANTY; without even the implied warranty of
a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	20 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	21 # GNU General Public License for more details.
1203 6832ef664673 source code cleanup: remove trailing white space, normalize file endings Marcin Kuzminski <marcin@python-works.com> parents: 1199 diff changeset	22 #
759 a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	23 # You should have received a copy of the GNU General Public License
1206 a671db5bdd58 fixed license issue #149 Marcin Kuzminski <marcin@python-works.com> parents: 1203 diff changeset	24 # along with this program. If not, see <http://www.gnu.org/licenses/>.
1199 268fa0b6b2ef Added os.sep in models for better win support Marcin Kuzminski <marcin@python-works.com> parents: 1193 diff changeset	25
268fa0b6b2ef Added os.sep in models for better win support Marcin Kuzminski <marcin@python-works.com> parents: 1193 diff changeset	26 import os
759 a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	27 import logging
a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	28 import datetime
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	29 import traceback
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	30 import hashlib
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	31 import time
1884 0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	32 from collections import defaultdict
759 a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	33
658 4ecb2ffcc110 fixed imports Marcin Kuzminski <marcin@python-works.com> parents: 657 diff changeset	34 from sqlalchemy import *
1546 c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	35 from sqlalchemy.ext.hybrid import hybrid_property
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	36 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
2357 ea079c9b62b5 merge with beta Marcin Kuzminski <marcin@python-works.com> parents: 2346 2356 diff changeset	37 from sqlalchemy.exc import DatabaseError
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	38 from beaker.cache import cache_region, region_invalidate
2496 fddd8e3fc157 use get_or_404 where possible Marcin Kuzminski <marcin@python-works.com> parents: 2481 diff changeset	39 from webob.exc import HTTPNotFound
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	40
2218 6e5d686084f1 fixed translation function for models Marcin Kuzminski <marcin@python-works.com> parents: 2217 diff changeset	41 from pylons.i18n.translation import lazy_ugettext as _
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	42
2007 324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: 2000 diff changeset	43 from rhodecode.lib.vcs import get_backend
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: 2000 diff changeset	44 from rhodecode.lib.vcs.utils.helpers import get_scm
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: 2000 diff changeset	45 from rhodecode.lib.vcs.exceptions import VCSError
324ac367a4da Added VCS into rhodecode core for faster and easier deployments of new versions Marcin Kuzminski <marcin@python-works.com> parents: 2000 diff changeset	46 from rhodecode.lib.vcs.utils.lazy import LazyProperty
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	47
2109 8ecfed1d8f8b utils/conf Marcin Kuzminski <marcin@python-works.com> parents: 2079 diff changeset	48 from rhodecode.lib.utils2 import str2bool, safe_str, get_changeset_safe, \
8ecfed1d8f8b utils/conf Marcin Kuzminski <marcin@python-works.com> parents: 2079 diff changeset	49 safe_unicode
1514 87ec80c280bb fixed issues with python2.5 Marcin Kuzminski <marcin@python-works.com> parents: 1508 diff changeset	50 from rhodecode.lib.compat import json
1669 f522f4d3bf93 moved caching query to libs Marcin Kuzminski <marcin@python-works.com> parents: 1665 diff changeset	51 from rhodecode.lib.caching_query import FromCache
1500 256e729a94cd Extended API Marcin Kuzminski <marcin@python-works.com> parents: 1466 diff changeset	52
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	53 from rhodecode.model.meta import Base, Session
1500 256e729a94cd Extended API Marcin Kuzminski <marcin@python-works.com> parents: 1466 diff changeset	54
2339 79b3c9c66c54 Added optional repo_name into issue tracker url to get just the name of repo without group prefix Marcin Kuzminski <marcin@python-works.com> parents: 2251 diff changeset	55 URL_SEP = '/'
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	56 log = logging.getLogger(__name__)
49 3ada2f409c1c Added sqlalchemy support Marcin Kuzminski <marcin@python-blog.com> parents: diff changeset	57
1081 70bf0be59653 fixed Session problems in model class functions Marcin Kuzminski <marcin@python-works.com> parents: 1065 diff changeset	58 #==============================================================================
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	59 # BASE CLASSES
1081 70bf0be59653 fixed Session problems in model class functions Marcin Kuzminski <marcin@python-works.com> parents: 1065 diff changeset	60 #==============================================================================
70bf0be59653 fixed Session problems in model class functions Marcin Kuzminski <marcin@python-works.com> parents: 1065 diff changeset	61
2062 bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	62 _hash_key = lambda k: hashlib.md5(safe_str(k)).hexdigest()
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	63
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	64
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	65 class BaseModel(object):
1758 a87aa385f21c fixed repo_create permission by adding missing commit statements Marcin Kuzminski <marcin@python-works.com> parents: 1757 diff changeset	66 """
a87aa385f21c fixed repo_create permission by adding missing commit statements Marcin Kuzminski <marcin@python-works.com> parents: 1757 diff changeset	67 Base Model for all classess
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	68 """
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	69
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	70 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	71 def _get_keys(cls):
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	72 """return column names for this model """
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	73 return class_mapper(cls).c.keys()
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	74
1948 4582e6b9e2f6 get_dict function garden Marcin Kuzminski <marcin@python-works.com> parents: 1886 diff changeset	75 def get_dict(self):
1758 a87aa385f21c fixed repo_create permission by adding missing commit statements Marcin Kuzminski <marcin@python-works.com> parents: 1757 diff changeset	76 """
a87aa385f21c fixed repo_create permission by adding missing commit statements Marcin Kuzminski <marcin@python-works.com> parents: 1757 diff changeset	77 return dict with keys and values corresponding
1948 4582e6b9e2f6 get_dict function garden Marcin Kuzminski <marcin@python-works.com> parents: 1886 diff changeset	78 to this model data """
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	79
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	80 d = {}
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	81 for k in self._get_keys():
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	82 d[k] = getattr(self, k)
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	83
1758 a87aa385f21c fixed repo_create permission by adding missing commit statements Marcin Kuzminski <marcin@python-works.com> parents: 1757 diff changeset	84 # also use __json__() if present to get additional fields
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	85 _json_attr = getattr(self, '__json__', None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	86 if _json_attr:
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	87 # update with attributes from __json__
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	88 if callable(_json_attr):
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	89 _json_attr = _json_attr()
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	90 for k, val in _json_attr.iteritems():
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	91 d[k] = val
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	92 return d
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	93
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	94 def get_appstruct(self):
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	95 """return list with keys and values tupples corresponding
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	96 to this model data """
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	97
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	98 l = []
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	99 for k in self._get_keys():
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	100 l.append((k, getattr(self, k),))
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	101 return l
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	102
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	103 def populate_obj(self, populate_dict):
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	104 """populate model with data from given populate_dict"""
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	105
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	106 for k in self._get_keys():
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	107 if k in populate_dict:
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	108 setattr(self, k, populate_dict[k])
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	109
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	110 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	111 def query(cls):
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	112 return Session().query(cls)
1388 2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	113
2029c17cc6c6 Added basic JsonSerialization into models. Marcin Kuzminski <marcin@python-works.com> parents: 1385 diff changeset	114 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	115 def get(cls, id_):
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	116 if id_:
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	117 return cls.query().get(id_)
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	118
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	119 @classmethod
2496 fddd8e3fc157 use get_or_404 where possible Marcin Kuzminski <marcin@python-works.com> parents: 2481 diff changeset	120 def get_or_404(cls, id_):
2942 f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	121 try:
f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	122 id_ = int(id_)
f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	123 except (TypeError, ValueError):
f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	124 raise HTTPNotFound
f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	125
f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	126 res = cls.query().get(id_)
f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	127 if not res:
f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	128 raise HTTPNotFound
f53faff4487e get_or_404 method does validation for ID beeing an INT Marcin Kuzminski <marcin@python-works.com> parents: 2937 diff changeset	129 return res
2496 fddd8e3fc157 use get_or_404 where possible Marcin Kuzminski <marcin@python-works.com> parents: 2481 diff changeset	130
fddd8e3fc157 use get_or_404 where possible Marcin Kuzminski <marcin@python-works.com> parents: 2481 diff changeset	131 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	132 def getAll(cls):
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	133 return cls.query().all()
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	134
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	135 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	136 def delete(cls, id_):
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	137 obj = cls.query().get(id_)
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	138 Session().delete(obj)
2161 e8c016815ab9 added hidden fulldiff GET param for disabling big diff cut off limit. Marcin Kuzminski <marcin@python-works.com> parents: 2157 diff changeset	139
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	140 def __repr__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	141 if hasattr(self, '__unicode__'):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	142 # python repr needs to return str
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	143 return safe_str(self.__unicode__())
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	144 return '<DB:%s>' % (self.__class__.__name__)
1081 70bf0be59653 fixed Session problems in model class functions Marcin Kuzminski <marcin@python-works.com> parents: 1065 diff changeset	145
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	146
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	147 class RhodeCodeSetting(Base, BaseModel):
548 b75b77ef649d renamed hg_app to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 547 diff changeset	148 __tablename__ = 'rhodecode_settings'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	149 __table_args__ = (
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	150 UniqueConstraint('app_settings_name'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	151 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	152 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	153 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	154 app_settings_id = Column("app_settings_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	155 app_settings_name = Column("app_settings_name", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	156 _app_settings_value = Column("app_settings_value", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
341 1ef52a70f3b7 Made config file free configuration based on database and capable of beeing manage via application settings + some code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 328 diff changeset	157
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	158 def __init__(self, k='', v=''):
704 26237de9b613 Added settings model, and Exceptions lib. Marcin Kuzminski <marcin@python-works.com> parents: 692 diff changeset	159 self.app_settings_name = k
26237de9b613 Added settings model, and Exceptions lib. Marcin Kuzminski <marcin@python-works.com> parents: 692 diff changeset	160 self.app_settings_value = v
26237de9b613 Added settings model, and Exceptions lib. Marcin Kuzminski <marcin@python-works.com> parents: 692 diff changeset	161
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	162 @validates('_app_settings_value')
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	163 def validate_settings_value(self, key, val):
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	164 assert type(val) == unicode
1561 4d841e565237 added validation of params on settings table Marcin Kuzminski <marcin@python-works.com> parents: 1556 diff changeset	165 return val
4d841e565237 added validation of params on settings table Marcin Kuzminski <marcin@python-works.com> parents: 1556 diff changeset	166
1546 c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	167 @hybrid_property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	168 def app_settings_value(self):
1546 c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	169 v = self._app_settings_value
2013 8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	170 if self.app_settings_name == 'ldap_active':
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	171 v = str2bool(v)
1591 0b63a0d2cede Merge with upstream Nicolas VINOT <aeris@imirhil.fr> parents: 1576 1590 diff changeset	172 return v
1546 c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	173
c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	174 @app_settings_value.setter
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	175 def app_settings_value(self, val):
1546 c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	176 """
c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	177 Setter that will always make sure we use unicode in app_settings_value
1591 0b63a0d2cede Merge with upstream Nicolas VINOT <aeris@imirhil.fr> parents: 1576 1590 diff changeset	178
1546 c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	179 :param val:
c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	180 """
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	181 self._app_settings_value = safe_unicode(val)
1546 c363267bbec7 fixes #265 ldap save fails sometimes on converting attributes to booleans, added getter and setter Marcin Kuzminski <marcin@python-works.com> parents: 1539 diff changeset	182
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	183 def __unicode__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	184 return u"<%s('%s:%s')>" % (
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	185 self.__class__.__name__,
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	186 self.app_settings_name, self.app_settings_value
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	187 )
704 26237de9b613 Added settings model, and Exceptions lib. Marcin Kuzminski <marcin@python-works.com> parents: 692 diff changeset	188
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	189 @classmethod
2674 a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	190 def get_by_name(cls, key):
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	191 return cls.query()\
2674 a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	192 .filter(cls.app_settings_name == key).scalar()
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	193
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	194 @classmethod
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	195 def get_by_name_or_create(cls, key):
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	196 res = cls.get_by_name(key)
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	197 if not res:
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	198 res = cls(key)
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	199 return res
1292 c0335c1dee36 added some fixes to LDAP form re-submition, new simples ldap-settings getter. Marcin Kuzminski <marcin@python-works.com> parents: 1279 diff changeset	200
c0335c1dee36 added some fixes to LDAP form re-submition, new simples ldap-settings getter. Marcin Kuzminski <marcin@python-works.com> parents: 1279 diff changeset	201 @classmethod
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	202 def get_app_settings(cls, cache=False):
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	203
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	204 ret = cls.query()
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	205
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	206 if cache:
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	207 ret = ret.options(FromCache("sql_cache_short", "get_hg_settings"))
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	208
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	209 if not ret:
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	210 raise Exception('Could not get application settings !')
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	211 settings = {}
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	212 for each in ret:
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	213 settings['rhodecode_' + each.app_settings_name] = \
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	214 each.app_settings_value
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	215
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	216 return settings
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	217
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	218 @classmethod
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	219 def get_ldap_settings(cls, cache=False):
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	220 ret = cls.query()\
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	221 .filter(cls.app_settings_name.startswith('ldap_')).all()
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	222 fd = {}
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	223 for row in ret:
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	224 fd.update({row.app_settings_name: row.app_settings_value})
1381 a1ab3e9c7e82 fixes #204, ldap active checkbox, credits goes to Matt Little. Marcin Kuzminski <marcin@python-works.com> parents: 1376 diff changeset	225
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	226 return fd
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	227
a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	228
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	229 class RhodeCodeUi(Base, BaseModel):
548 b75b77ef649d renamed hg_app to rhodecode Marcin Kuzminski <marcin@python-works.com> parents: 547 diff changeset	230 __tablename__ = 'rhodecode_ui'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	231 __table_args__ = (
1963 9bbde54232dc white space cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1960 diff changeset	232 UniqueConstraint('ui_key'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	233 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	234 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	235 )
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	236
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	237 HOOK_UPDATE = 'changegroup.update'
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	238 HOOK_REPO_SIZE = 'changegroup.repo_size'
2407 8a68e0292232 Change git & hg hooks to post. They shouldn't block as they are used just for logging actions. Futhermore post hooks have access to changesets, so it's much better flexible Marcin Kuzminski <marcin@python-works.com> parents: 2401 diff changeset	239 HOOK_PUSH = 'changegroup.push_logger'
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	240 HOOK_PRE_PUSH = 'prechangegroup.pre_push'
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	241 HOOK_PULL = 'outgoing.pull_logger'
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	242 HOOK_PRE_PULL = 'preoutgoing.pre_pull'
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	243
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	244 ui_id = Column("ui_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	245 ui_section = Column("ui_section", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	246 ui_key = Column("ui_key", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	247 ui_value = Column("ui_value", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	248 ui_active = Column("ui_active", Boolean(), nullable=True, unique=None, default=True)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	249
1345 3bce31f026b8 #47 implemented Adding of new repo_groups+forms+validators. Fixed sorting of repo groups by main names in multiple locations. Removed some unneeded calls to self.sa for exchange to .query() methods. Marcin Kuzminski <marcin@python-works.com> parents: 1343 diff changeset	250 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	251 def get_by_key(cls, key):
2708 9bce679a3f49 Added form for controlling mercurial extensions Marcin Kuzminski <marcin@python-works.com> parents: 2689 diff changeset	252 return cls.query().filter(cls.ui_key == key).scalar()
1345 3bce31f026b8 #47 implemented Adding of new repo_groups+forms+validators. Fixed sorting of repo groups by main names in multiple locations. Removed some unneeded calls to self.sa for exchange to .query() methods. Marcin Kuzminski <marcin@python-works.com> parents: 1343 diff changeset	253
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	254 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	255 def get_builtin_hooks(cls):
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	256 q = cls.query()
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	257 q = q.filter(cls.ui_key.in_([cls.HOOK_UPDATE, cls.HOOK_REPO_SIZE,
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	258 cls.HOOK_PUSH, cls.HOOK_PRE_PUSH,
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	259 cls.HOOK_PULL, cls.HOOK_PRE_PULL]))
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	260 return q.all()
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	261
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	262 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	263 def get_custom_hooks(cls):
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	264 q = cls.query()
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	265 q = q.filter(~cls.ui_key.in_([cls.HOOK_UPDATE, cls.HOOK_REPO_SIZE,
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	266 cls.HOOK_PUSH, cls.HOOK_PRE_PUSH,
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	267 cls.HOOK_PULL, cls.HOOK_PRE_PULL]))
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	268 q = q.filter(cls.ui_section == 'hooks')
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	269 return q.all()
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	270
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	271 @classmethod
2401 e2af60e480ce Removed hardcoded hooks names from settings. Marcin Kuzminski <marcin@python-works.com> parents: 2400 diff changeset	272 def get_repos_location(cls):
2708 9bce679a3f49 Added form for controlling mercurial extensions Marcin Kuzminski <marcin@python-works.com> parents: 2689 diff changeset	273 return cls.get_by_key('/').ui_value
2401 e2af60e480ce Removed hardcoded hooks names from settings. Marcin Kuzminski <marcin@python-works.com> parents: 2400 diff changeset	274
e2af60e480ce Removed hardcoded hooks names from settings. Marcin Kuzminski <marcin@python-works.com> parents: 2400 diff changeset	275 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	276 def create_or_update_hook(cls, key, val):
2708 9bce679a3f49 Added form for controlling mercurial extensions Marcin Kuzminski <marcin@python-works.com> parents: 2689 diff changeset	277 new_ui = cls.get_by_key(key) or cls()
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	278 new_ui.ui_section = 'hooks'
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	279 new_ui.ui_active = True
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	280 new_ui.ui_key = key
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	281 new_ui.ui_value = val
b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	282
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	283 Session().add(new_ui)
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	284
2821 9c90be87ae05 fixed issue #560 require push ssl checkbox wasn't shown when option was enabled Marcin Kuzminski <marcin@python-works.com> parents: 2809 diff changeset	285 def __repr__(self):
9c90be87ae05 fixed issue #560 require push ssl checkbox wasn't shown when option was enabled Marcin Kuzminski <marcin@python-works.com> parents: 2809 diff changeset	286 return '<DB:%s[%s:%s]>' % (self.__class__.__name__, self.ui_key,
9c90be87ae05 fixed issue #560 require push ssl checkbox wasn't shown when option was enabled Marcin Kuzminski <marcin@python-works.com> parents: 2809 diff changeset	287 self.ui_value)
9c90be87ae05 fixed issue #560 require push ssl checkbox wasn't shown when option was enabled Marcin Kuzminski <marcin@python-works.com> parents: 2809 diff changeset	288
1460 b50348816a80 Added more advanced hook management into rhodecode admin settings Marcin Kuzminski <marcin@python-works.com> parents: 1436 diff changeset	289
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	290 class User(Base, BaseModel):
49 3ada2f409c1c Added sqlalchemy support Marcin Kuzminski <marcin@python-blog.com> parents: diff changeset	291 __tablename__ = 'users'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	292 __table_args__ = (
1963 9bbde54232dc white space cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1960 diff changeset	293 UniqueConstraint('username'), UniqueConstraint('email'),
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	294 Index('u_username_idx', 'username'),
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	295 Index('u_email_idx', 'email'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	296 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	297 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	298 )
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	299 DEFAULT_USER = 'default'
2798 091e99b29fd4 auto-healing of permissions for default user after upgrading from some old versions. Marcin Kuzminski <marcin@python-works.com> parents: 2797 diff changeset	300 DEFAULT_PERMISSIONS = [
091e99b29fd4 auto-healing of permissions for default user after upgrading from some old versions. Marcin Kuzminski <marcin@python-works.com> parents: 2797 diff changeset	301 'hg.register.manual_activate', 'hg.create.repository',
091e99b29fd4 auto-healing of permissions for default user after upgrading from some old versions. Marcin Kuzminski <marcin@python-works.com> parents: 2797 diff changeset	302 'hg.fork.repository', 'repository.read'
091e99b29fd4 auto-healing of permissions for default user after upgrading from some old versions. Marcin Kuzminski <marcin@python-works.com> parents: 2797 diff changeset	303 ]
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	304 user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	305 username = Column("username", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	306 password = Column("password", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
2480 cb9e73b29a87 User active flag should be default to True Marcin Kuzminski <marcin@python-works.com> parents: 2463 diff changeset	307 active = Column("active", Boolean(), nullable=True, unique=None, default=True)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	308 admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	309 name = Column("firstname", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	310 lastname = Column("lastname", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	311 _email = Column("email", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	312 last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	313 ldap_dn = Column("ldap_dn", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	314 api_key = Column("api_key", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
2709 d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	315 inherit_default_permissions = Column("inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	316
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	317 user_log = relationship('UserLog', cascade='all')
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	318 user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	319
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	320 repositories = relationship('Repository')
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	321 user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	322 repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	323 repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
2150 a8c9c0094ddf White space cleanup Marcin Kuzminski <marcin@python-works.com> parents: 2149 diff changeset	324
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	325 group_member = relationship('UsersGroupMember', cascade='all')
1065 5d676b6ab71c Moved BaseModel into base class for declarative base. Added some handy methods into Marcin Kuzminski <marcin@python-works.com> parents: 1039 diff changeset	326
2157 6a2c0cfb018d Cascade delete comments and notifications when removing user. Marcin Kuzminski <marcin@python-works.com> parents: 2156 diff changeset	327 notifications = relationship('UserNotification', cascade='all')
6a2c0cfb018d Cascade delete comments and notifications when removing user. Marcin Kuzminski <marcin@python-works.com> parents: 2156 diff changeset	328 # notifications assigned to this user
6a2c0cfb018d Cascade delete comments and notifications when removing user. Marcin Kuzminski <marcin@python-works.com> parents: 2156 diff changeset	329 user_created_notifications = relationship('Notification', cascade='all')
6a2c0cfb018d Cascade delete comments and notifications when removing user. Marcin Kuzminski <marcin@python-works.com> parents: 2156 diff changeset	330 # comments created by this user
6a2c0cfb018d Cascade delete comments and notifications when removing user. Marcin Kuzminski <marcin@python-works.com> parents: 2156 diff changeset	331 user_comments = relationship('ChangesetComment', cascade='all')
2562 78f96d7bb23b cascade delete extra emails on user delete Marcin Kuzminski <marcin@python-works.com> parents: 2544 diff changeset	332 #extra emails for this user
78f96d7bb23b cascade delete extra emails on user delete Marcin Kuzminski <marcin@python-works.com> parents: 2544 diff changeset	333 user_emails = relationship('UserEmailMap', cascade='all')
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	334
1757 2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	335 @hybrid_property
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	336 def email(self):
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	337 return self._email
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	338
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	339 @email.setter
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	340 def email(self, val):
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	341 self._email = val.lower() if val else None
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	342
759 a7f50911a945 Models code cleanups Marcin Kuzminski <marcin@python-works.com> parents: 734 diff changeset	343 @property
2731 09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	344 def firstname(self):
09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	345 # alias for future
09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	346 return self.name
09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	347
09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	348 @property
2506 7e3e9d0c5575 Add list of all emails that user may have into get_user call Marcin Kuzminski <marcin@python-works.com> parents: 2496 diff changeset	349 def emails(self):
7e3e9d0c5575 Add list of all emails that user may have into get_user call Marcin Kuzminski <marcin@python-works.com> parents: 2496 diff changeset	350 other = UserEmailMap.query().filter(UserEmailMap.user==self).all()
7e3e9d0c5575 Add list of all emails that user may have into get_user call Marcin Kuzminski <marcin@python-works.com> parents: 2496 diff changeset	351 return [self.email] + [x.email for x in other]
7e3e9d0c5575 Add list of all emails that user may have into get_user call Marcin Kuzminski <marcin@python-works.com> parents: 2496 diff changeset	352
7e3e9d0c5575 Add list of all emails that user may have into get_user call Marcin Kuzminski <marcin@python-works.com> parents: 2496 diff changeset	353 @property
2731 09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	354 def username_and_name(self):
09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	355 return '%s (%s %s)' % (self.username, self.firstname, self.lastname)
09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	356
09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	357 @property
1731 31e6eb2fb4b2 implements #222 registration feedback Marcin Kuzminski <marcin@python-works.com> parents: 1729 diff changeset	358 def full_name(self):
2731 09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	359 return '%s %s' % (self.firstname, self.lastname)
1731 31e6eb2fb4b2 implements #222 registration feedback Marcin Kuzminski <marcin@python-works.com> parents: 1729 diff changeset	360
31e6eb2fb4b2 implements #222 registration feedback Marcin Kuzminski <marcin@python-works.com> parents: 1729 diff changeset	361 @property
1950 4ae17f819ee8 #344 optional firstname lastname on user creation Marcin Kuzminski <marcin@python-works.com> parents: 1948 diff changeset	362 def full_name_or_username(self):
2731 09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	363 return ('%s %s' % (self.firstname, self.lastname)
09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	364 if (self.firstname and self.lastname) else self.username)
1950 4ae17f819ee8 #344 optional firstname lastname on user creation Marcin Kuzminski <marcin@python-works.com> parents: 1948 diff changeset	365
4ae17f819ee8 #344 optional firstname lastname on user creation Marcin Kuzminski <marcin@python-works.com> parents: 1948 diff changeset	366 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	367 def full_contact(self):
2731 09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	368 return '%s %s <%s>' % (self.firstname, self.lastname, self.email)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	369
895 62c04c5cc971 Added some more details into user edit permissions view Marcin Kuzminski <marcin@python-works.com> parents: 880 diff changeset	370 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	371 def short_contact(self):
2731 09d8fec02954 Implemented #532. Marcin Kuzminski <marcin@python-works.com> parents: 2726 diff changeset	372 return '%s %s' % (self.firstname, self.lastname)
1088 fee472613dfa made simple global rss and atom feed Marcin Kuzminski <marcin@python-works.com> parents: 1081 diff changeset	373
fee472613dfa made simple global rss and atom feed Marcin Kuzminski <marcin@python-works.com> parents: 1081 diff changeset	374 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	375 def is_admin(self):
895 62c04c5cc971 Added some more details into user edit permissions view Marcin Kuzminski <marcin@python-works.com> parents: 880 diff changeset	376 return self.admin
62c04c5cc971 Added some more details into user edit permissions view Marcin Kuzminski <marcin@python-works.com> parents: 880 diff changeset	377
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	378 def __unicode__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	379 return u"<%s('id:%s:%s')>" % (self.__class__.__name__,
1712 cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	380 self.user_id, self.username)
cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	381
1065 5d676b6ab71c Moved BaseModel into base class for declarative base. Added some handy methods into Marcin Kuzminski <marcin@python-works.com> parents: 1039 diff changeset	382 @classmethod
1665 36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	383 def get_by_username(cls, username, case_insensitive=False, cache=False):
1400 0d7b56b97953 Simplified last_login call on user, and changed login to use User model directly Marcin Kuzminski <marcin@python-works.com> parents: 1388 diff changeset	384 if case_insensitive:
1665 36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	385 q = cls.query().filter(cls.username.ilike(username))
1400 0d7b56b97953 Simplified last_login call on user, and changed login to use User model directly Marcin Kuzminski <marcin@python-works.com> parents: 1388 diff changeset	386 else:
1665 36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	387 q = cls.query().filter(cls.username == username)
36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	388
36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	389 if cache:
2062 bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	390 q = q.options(FromCache(
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	391 "sql_cache_short",
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	392 "get_user_%s" % _hash_key(username)
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	393 )
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	394 )
1665 36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	395 return q.scalar()
1065 5d676b6ab71c Moved BaseModel into base class for declarative base. Added some handy methods into Marcin Kuzminski <marcin@python-works.com> parents: 1039 diff changeset	396
1417 5875955def39 fixes #223 improve password reset form Marcin Kuzminski <marcin@python-works.com> parents: 1401 diff changeset	397 @classmethod
1665 36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	398 def get_by_api_key(cls, api_key, cache=False):
36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	399 q = cls.query().filter(cls.api_key == api_key)
36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	400
36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	401 if cache:
36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	402 q = q.options(FromCache("sql_cache_short",
36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	403 "get_api_key_%s" % api_key))
1693 60249224be04 fix for api key lookup, reuse same function in user model Marcin Kuzminski <marcin@python-works.com> parents: 1677 diff changeset	404 return q.scalar()
1417 5875955def39 fixes #223 improve password reset form Marcin Kuzminski <marcin@python-works.com> parents: 1401 diff changeset	405
1716 7d1fc253549e notification to commit author + gardening Marcin Kuzminski <marcin@python-works.com> parents: 1713 diff changeset	406 @classmethod
1757 2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	407 def get_by_email(cls, email, case_insensitive=False, cache=False):
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	408 if case_insensitive:
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	409 q = cls.query().filter(cls.email.ilike(email))
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	410 else:
2aa7f454204e fixes #298, ldap email addresses created by rhodecode automatically during first login didn't get converted to lower case, which lead to lookup failures and than wrong checks for uniqueness. Fixed that by putting a setter on db model column that will enforce converting to lowercase. Marcin Kuzminski <marcin@python-works.com> parents: 1749 diff changeset	411 q = cls.query().filter(cls.email == email)
1716 7d1fc253549e notification to commit author + gardening Marcin Kuzminski <marcin@python-works.com> parents: 1713 diff changeset	412
7d1fc253549e notification to commit author + gardening Marcin Kuzminski <marcin@python-works.com> parents: 1713 diff changeset	413 if cache:
7d1fc253549e notification to commit author + gardening Marcin Kuzminski <marcin@python-works.com> parents: 1713 diff changeset	414 q = q.options(FromCache("sql_cache_short",
2329 20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	415 "get_email_key_%s" % email))
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	416
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	417 ret = q.scalar()
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	418 if ret is None:
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	419 q = UserEmailMap.query()
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	420 # try fetching in alternate email map
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	421 if case_insensitive:
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	422 q = q.filter(UserEmailMap.email.ilike(email))
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	423 else:
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	424 q = q.filter(UserEmailMap.email == email)
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	425 q = q.options(joinedload(UserEmailMap.user))
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	426 if cache:
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	427 q = q.options(FromCache("sql_cache_short",
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	428 "get_email_map_key_%s" % email))
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	429 ret = getattr(q.scalar(), 'user', None)
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	430
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	431 return ret
1716 7d1fc253549e notification to commit author + gardening Marcin Kuzminski <marcin@python-works.com> parents: 1713 diff changeset	432
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	433 def update_lastlogin(self):
442 d66a7fa7689b moved loged in user propagation out of forms, Marcin Kuzminski <marcin@python-works.com> parents: 417 diff changeset	434 """Update user lastlogin"""
1400 0d7b56b97953 Simplified last_login call on user, and changed login to use User model directly Marcin Kuzminski <marcin@python-works.com> parents: 1388 diff changeset	435 self.last_login = datetime.datetime.now()
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	436 Session().add(self)
1976 a76e9bacbedc garden Marcin Kuzminski <marcin@python-works.com> parents: 1963 diff changeset	437 log.debug('updated user %s lastlogin' % self.username)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	438
2508 43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	439 def get_api_data(self):
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	440 """
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	441 Common function for generating user related data for API
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	442 """
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	443 user = self
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	444 data = dict(
2510 9059b2d91303 Change return paremeters for get_api_data in user and repo Marcin Kuzminski <marcin@python-works.com> parents: 2508 diff changeset	445 user_id=user.user_id,
2508 43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	446 username=user.username,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	447 firstname=user.name,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	448 lastname=user.lastname,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	449 email=user.email,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	450 emails=user.emails,
2510 9059b2d91303 Change return paremeters for get_api_data in user and repo Marcin Kuzminski <marcin@python-works.com> parents: 2508 diff changeset	451 api_key=user.api_key,
2508 43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	452 active=user.active,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	453 admin=user.admin,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	454 ldap_dn=user.ldap_dn,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	455 last_login=user.last_login,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	456 )
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	457 return data
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	458
1758 a87aa385f21c fixed repo_create permission by adding missing commit statements Marcin Kuzminski <marcin@python-works.com> parents: 1757 diff changeset	459 def __json__(self):
2544 6ce3387bf0ce Renamed name to firstname in forms Marcin Kuzminski <marcin@python-works.com> parents: 2542 diff changeset	460 data = dict(
1950 4ae17f819ee8 #344 optional firstname lastname on user creation Marcin Kuzminski <marcin@python-works.com> parents: 1948 diff changeset	461 full_name=self.full_name,
4ae17f819ee8 #344 optional firstname lastname on user creation Marcin Kuzminski <marcin@python-works.com> parents: 1948 diff changeset	462 full_name_or_username=self.full_name_or_username,
4ae17f819ee8 #344 optional firstname lastname on user creation Marcin Kuzminski <marcin@python-works.com> parents: 1948 diff changeset	463 short_contact=self.short_contact,
4ae17f819ee8 #344 optional firstname lastname on user creation Marcin Kuzminski <marcin@python-works.com> parents: 1948 diff changeset	464 full_contact=self.full_contact
4ae17f819ee8 #344 optional firstname lastname on user creation Marcin Kuzminski <marcin@python-works.com> parents: 1948 diff changeset	465 )
2544 6ce3387bf0ce Renamed name to firstname in forms Marcin Kuzminski <marcin@python-works.com> parents: 2542 diff changeset	466 data.update(self.get_api_data())
6ce3387bf0ce Renamed name to firstname in forms Marcin Kuzminski <marcin@python-works.com> parents: 2542 diff changeset	467 return data
1758 a87aa385f21c fixed repo_create permission by adding missing commit statements Marcin Kuzminski <marcin@python-works.com> parents: 1757 diff changeset	468
a87aa385f21c fixed repo_create permission by adding missing commit statements Marcin Kuzminski <marcin@python-works.com> parents: 1757 diff changeset	469
2329 20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	470 class UserEmailMap(Base, BaseModel):
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	471 __tablename__ = 'user_email_map'
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	472 __table_args__ = (
2463 b426ecc30319 Added some DB indexes to optimize queries Marcin Kuzminski <marcin@python-works.com> parents: 2462 diff changeset	473 Index('uem_email_idx', 'email'),
2329 20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	474 UniqueConstraint('email'),
2463 b426ecc30319 Added some DB indexes to optimize queries Marcin Kuzminski <marcin@python-works.com> parents: 2462 diff changeset	475 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2329 20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	476 'mysql_charset': 'utf8'}
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	477 )
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	478 __mapper_args__ = {}
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	479
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	480 email_id = Column("email_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	481 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	482 _email = Column("email", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None)
2463 b426ecc30319 Added some DB indexes to optimize queries Marcin Kuzminski <marcin@python-works.com> parents: 2462 diff changeset	483 user = relationship('User', lazy='joined')
2329 20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	484
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	485 @validates('_email')
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	486 def validate_email(self, key, email):
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	487 # check if this email is not main one
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	488 main_email = Session().query(User).filter(User.email == email).scalar()
2329 20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	489 if main_email is not None:
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	490 raise AttributeError('email %s is present is user table' % email)
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	491 return email
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	492
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	493 @hybrid_property
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	494 def email(self):
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	495 return self._email
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	496
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	497 @email.setter
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	498 def email(self, val):
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	499 self._email = val.lower() if val else None
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	500
20e307d5250f Added email-map for alternative email addresses for users Marcin Kuzminski <marcin@python-works.com> parents: 2296 diff changeset	501
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	502 class UserLog(Base, BaseModel):
49 3ada2f409c1c Added sqlalchemy support Marcin Kuzminski <marcin@python-blog.com> parents: diff changeset	503 __tablename__ = 'user_logs'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	504 __table_args__ = (
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	505 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	506 'mysql_charset': 'utf8'},
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	507 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	508 user_log_id = Column("user_log_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	509 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
1747 8804715404c9 implements #193 journal stores information about deleting of repos Marcin Kuzminski <marcin@python-works.com> parents: 1744 diff changeset	510 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	511 repository_name = Column("repository_name", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	512 user_ip = Column("user_ip", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	513 action = Column("action", UnicodeText(1200000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	514 action_date = Column("action_date", DateTime(timezone=False), nullable=True, unique=None, default=None)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	515
994 7f9d23f6a526 Added grouping by days in journal Marcin Kuzminski <marcin@python-works.com> parents: 991 diff changeset	516 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	517 def action_as_day(self):
1723 64e91067b996 - refactoring to overcome poor usage of global pylons config Marcin Kuzminski <marcin@python-works.com> parents: 1717 diff changeset	518 return datetime.date(*self.action_date.timetuple()[:3])
994 7f9d23f6a526 Added grouping by days in journal Marcin Kuzminski <marcin@python-works.com> parents: 991 diff changeset	519
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	520 user = relationship('User')
2063 d9ba58526712 fixed #373 missing cascade drop on user_group_to_perm table Marcin Kuzminski <marcin@python-works.com> parents: 2062 diff changeset	521 repository = relationship('Repository', cascade='')
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	522
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	523
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	524 class UsersGroup(Base, BaseModel):
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	525 __tablename__ = 'users_groups'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	526 __table_args__ = (
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	527 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	528 'mysql_charset': 'utf8'},
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	529 )
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	530
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	531 users_group_id = Column("users_group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	532 users_group_name = Column("users_group_name", String(255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	533 users_group_active = Column("users_group_active", Boolean(), nullable=True, unique=None, default=None)
2709 d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	534 inherit_default_permissions = Column("users_group_inherit_default_permissions", Boolean(), nullable=False, unique=None, default=True)
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	535
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	536 members = relationship('UsersGroupMember', cascade="all, delete, delete-orphan", lazy="joined")
2063 d9ba58526712 fixed #373 missing cascade drop on user_group_to_perm table Marcin Kuzminski <marcin@python-works.com> parents: 2062 diff changeset	537 users_group_to_perm = relationship('UsersGroupToPerm', cascade='all')
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	538 users_group_repo_to_perm = relationship('UsersGroupRepoToPerm', cascade='all')
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	539
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	540 def __unicode__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	541 return u'<userGroup(%s)>' % (self.users_group_name)
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	542
aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	543 @classmethod
1728 07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	544 def get_by_group_name(cls, group_name, cache=False,
07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	545 case_insensitive=False):
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	546 if case_insensitive:
1728 07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	547 q = cls.query().filter(cls.users_group_name.ilike(group_name))
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	548 else:
1728 07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	549 q = cls.query().filter(cls.users_group_name == group_name)
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	550 if cache:
2062 bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	551 q = q.options(FromCache(
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	552 "sql_cache_short",
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	553 "get_user_%s" % _hash_key(group_name)
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	554 )
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	555 )
1728 07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	556 return q.scalar()
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	557
1436 88d13c1c6a55 removed users_group controller in replace for model methods, Marcin Kuzminski <marcin@python-works.com> parents: 1435 diff changeset	558 @classmethod
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	559 def get(cls, users_group_id, cache=False):
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	560 users_group = cls.query()
1436 88d13c1c6a55 removed users_group controller in replace for model methods, Marcin Kuzminski <marcin@python-works.com> parents: 1435 diff changeset	561 if cache:
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	562 users_group = users_group.options(FromCache("sql_cache_short",
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	563 "get_users_group_%s" % users_group_id))
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	564 return users_group.get(users_group_id)
1436 88d13c1c6a55 removed users_group controller in replace for model methods, Marcin Kuzminski <marcin@python-works.com> parents: 1435 diff changeset	565
2523 788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	566 def get_api_data(self):
788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	567 users_group = self
788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	568
788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	569 data = dict(
2531 d80a68e2ebcc return proper id from users_group Marcin Kuzminski <marcin@python-works.com> parents: 2523 diff changeset	570 users_group_id=users_group.users_group_id,
2523 788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	571 group_name=users_group.users_group_name,
788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	572 active=users_group.users_group_active,
788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	573 )
788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	574
788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	575 return data
788ae4f7d8df added get_api_data into UsersGroup Marcin Kuzminski <marcin@python-works.com> parents: 2520 diff changeset	576
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	577
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	578 class UsersGroupMember(Base, BaseModel):
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	579 __tablename__ = 'users_groups_members'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	580 __table_args__ = (
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	581 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	582 'mysql_charset': 'utf8'},
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	583 )
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	584
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	585 users_group_member_id = Column("users_group_member_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	586 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	587 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	588
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	589 user = relationship('User', lazy='joined')
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	590 users_group = relationship('UsersGroup')
972 2c8fd84935a4 #56 implemented users groups editing, Marcin Kuzminski <marcin@python-works.com> parents: 962 diff changeset	591
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	592 def __init__(self, gr_id='', u_id=''):
972 2c8fd84935a4 #56 implemented users groups editing, Marcin Kuzminski <marcin@python-works.com> parents: 962 diff changeset	593 self.users_group_id = gr_id
2c8fd84935a4 #56 implemented users groups editing, Marcin Kuzminski <marcin@python-works.com> parents: 962 diff changeset	594 self.user_id = u_id
956 83d35d716a02 started working on issue #56 Marcin Kuzminski <marcin@python-works.com> parents: 907 diff changeset	595
2013 8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	596
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	597 class Repository(Base, BaseModel):
234 a0116e944da1 changed naming convention for db modules. Marcin Kuzminski <marcin@python-works.com> parents: 232 diff changeset	598 __tablename__ = 'repositories'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	599 __table_args__ = (
1963 9bbde54232dc white space cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1960 diff changeset	600 UniqueConstraint('repo_name'),
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	601 Index('r_repo_name_idx', 'repo_name'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	602 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	603 'mysql_charset': 'utf8'},
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	604 )
1081 70bf0be59653 fixed Session problems in model class functions Marcin Kuzminski <marcin@python-works.com> parents: 1065 diff changeset	605
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	606 repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	607 repo_name = Column("repo_name", String(255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	608 clone_uri = Column("clone_uri", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	609 repo_type = Column("repo_type", String(255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	610 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	611 private = Column("private", Boolean(), nullable=True, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	612 enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	613 enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	614 description = Column("description", String(10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	615 created_on = Column('created_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
2797 c9baaacb670a Remove null from revision column as for comments inside pull requests to work properly Marcin Kuzminski <marcin@python-works.com> parents: 2791 diff changeset	616 updated_on = Column('updated_on', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	617 landing_rev = Column("landing_revision", String(255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default=None)
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	618 enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	619 _locked = Column("locked", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None)
1301 7e75af301842 Added simple forks page, resolves issue #179 Marcin Kuzminski <marcin@python-works.com> parents: 1292 diff changeset	620
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	621 fork_id = Column("fork_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=False, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	622 group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=False, default=None)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	623
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	624 user = relationship('User')
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	625 fork = relationship('Repository', remote_side=repo_id)
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	626 group = relationship('RepoGroup')
2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	627 repo_to_perm = relationship('UserRepoToPerm', cascade='all', order_by='UserRepoToPerm.repo_to_perm_id')
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	628 users_group_to_perm = relationship('UsersGroupRepoToPerm', cascade='all')
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	629 stats = relationship('Statistics', cascade='all', uselist=False)
667 56a8434a88cc fixes #51 deleting a repo didn't delete it's dependent db entries. Marcin Kuzminski <marcin@python-works.com> parents: 658 diff changeset	630
2674 a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	631 followers = relationship('UserFollowing',
a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	632 primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id',
2666 c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	633 cascade='all')
734 49eb69d78988 implemented user dashboards, and following system. Marcin Kuzminski <marcin@python-works.com> parents: 713 diff changeset	634
1747 8804715404c9 implements #193 journal stores information about deleting of repos Marcin Kuzminski <marcin@python-works.com> parents: 1744 diff changeset	635 logs = relationship('UserLog')
2665 81a17ef4afc0 cascade delete comments when deleting repo, else it's a error preventing deletion Marcin Kuzminski <marcin@python-works.com> parents: 2639 diff changeset	636 comments = relationship('ChangesetComment', cascade="all, delete, delete-orphan")
970 1a5c41e4bb02 fixees for #106 relation issues on databases different than sqlite Marcin Kuzminski <marcin@python-works.com> parents: 962 diff changeset	637
2666 c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	638 pull_requests_org = relationship('PullRequest',
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	639 primaryjoin='PullRequest.org_repo_id==Repository.repo_id',
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	640 cascade="all, delete, delete-orphan")
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	641
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	642 pull_requests_other = relationship('PullRequest',
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	643 primaryjoin='PullRequest.other_repo_id==Repository.repo_id',
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	644 cascade="all, delete, delete-orphan")
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	645
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	646 def __unicode__(self):
2459 9492ab68331f Initial version of landing revisions ref #483 Marcin Kuzminski <marcin@python-works.com> parents: 2407 diff changeset	647 return u"<%s('%s:%s')>" % (self.__class__.__name__, self.repo_id,
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	648 self.repo_name)
878 859bc9e7a15d Extended repo2db mapper with group creation via directory structures Marcin Kuzminski <marcin@python-works.com> parents: 836 diff changeset	649
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	650 @hybrid_property
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	651 def locked(self):
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	652 # always should return [user_id, timelocked]
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	653 if self._locked:
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	654 _lock_info = self._locked.split(':')
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	655 return int(_lock_info[0]), _lock_info[1]
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	656 return [None, None]
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	657
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	658 @locked.setter
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	659 def locked(self, val):
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	660 if val and isinstance(val, (list, tuple)):
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	661 self._locked = ':'.join(map(str, val))
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	662 else:
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	663 self._locked = None
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	664
1065 5d676b6ab71c Moved BaseModel into base class for declarative base. Added some handy methods into Marcin Kuzminski <marcin@python-works.com> parents: 1039 diff changeset	665 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	666 def url_sep(cls):
2339 79b3c9c66c54 Added optional repo_name into issue tracker url to get just the name of repo without group prefix Marcin Kuzminski <marcin@python-works.com> parents: 2251 diff changeset	667 return URL_SEP
1065 5d676b6ab71c Moved BaseModel into base class for declarative base. Added some handy methods into Marcin Kuzminski <marcin@python-works.com> parents: 1039 diff changeset	668
1554 e7c6341ad3cb fixes #245 Rescan of the repositories on Windows Marcin Kuzminski <marcin@python-works.com> parents: 1547 diff changeset	669 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	670 def get_by_repo_name(cls, repo_name):
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	671 q = Session().query(cls).filter(cls.repo_name == repo_name)
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	672 q = q.options(joinedload(Repository.fork))\
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	673 .options(joinedload(Repository.user))\
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	674 .options(joinedload(Repository.group))
1749 8ecc6b8229a5 commit less models Marcin Kuzminski <marcin@python-works.com> parents: 1747 diff changeset	675 return q.scalar()
1301 7e75af301842 Added simple forks page, resolves issue #179 Marcin Kuzminski <marcin@python-works.com> parents: 1292 diff changeset	676
7e75af301842 Added simple forks page, resolves issue #179 Marcin Kuzminski <marcin@python-works.com> parents: 1292 diff changeset	677 @classmethod
2400 e87c6aa9c5e7 Add method for fetching repos by full path Marcin Kuzminski <marcin@python-works.com> parents: 2356 diff changeset	678 def get_by_full_path(cls, repo_full_path):
e87c6aa9c5e7 Add method for fetching repos by full path Marcin Kuzminski <marcin@python-works.com> parents: 2356 diff changeset	679 repo_name = repo_full_path.split(cls.base_path(), 1)[-1]
e87c6aa9c5e7 Add method for fetching repos by full path Marcin Kuzminski <marcin@python-works.com> parents: 2356 diff changeset	680 return cls.get_by_repo_name(repo_name.strip(URL_SEP))
e87c6aa9c5e7 Add method for fetching repos by full path Marcin Kuzminski <marcin@python-works.com> parents: 2356 diff changeset	681
e87c6aa9c5e7 Add method for fetching repos by full path Marcin Kuzminski <marcin@python-works.com> parents: 2356 diff changeset	682 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	683 def get_repo_forks(cls, repo_id):
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	684 return cls.query().filter(Repository.fork_id == repo_id)
1301 7e75af301842 Added simple forks page, resolves issue #179 Marcin Kuzminski <marcin@python-works.com> parents: 1292 diff changeset	685
1508 4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	686 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	687 def base_path(cls):
1508 4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	688 """
4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	689 Returns base path when all repos are stored
1587 8898a79ac628 Implement all CRUD API operation for repo Nicolas VINOT <aeris@imirhil.fr> parents: 1586 diff changeset	690
1508 4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	691 :param cls:
4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	692 """
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	693 q = Session().query(RhodeCodeUi)\
1728 07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	694 .filter(RhodeCodeUi.ui_key == cls.url_sep())
07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	695 q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
1508 4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	696 return q.one().ui_value
4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	697
1113 c1eda8ec4a46 added clone_uri,api_key into models. Fixed models for mysql compatibilty Marcin Kuzminski <marcin@python-works.com> parents: 1088 diff changeset	698 @property
2395 b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	699 def forks(self):
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	700 """
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	701 Return forks of this repo
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	702 """
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	703 return Repository.get_repo_forks(self.repo_id)
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	704
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	705 @property
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	706 def parent(self):
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	707 """
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	708 Returns fork parent
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	709 """
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	710 return self.fork
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	711
b262e349a7a5 created pull-request overview Marcin Kuzminski <marcin@python-works.com> parents: 2392 diff changeset	712 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	713 def just_name(self):
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	714 return self.repo_name.split(Repository.url_sep())[-1]
1155 37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	715
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	716 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	717 def groups_with_parents(self):
1155 37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	718 groups = []
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	719 if self.group is None:
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	720 return groups
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	721
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	722 cur_gr = self.group
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	723 groups.insert(0, cur_gr)
1155 37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	724 while 1:
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	725 gr = getattr(cur_gr, 'parent_group', None)
1155 37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	726 cur_gr = cur_gr.parent_group
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	727 if gr is None:
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	728 break
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	729 groups.insert(0, gr)
1155 37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	730
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	731 return groups
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	732
37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	733 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	734 def groups_and_repo(self):
1155 37a9421f32a0 Added handy methods to Repository model for fetching groups with parents Marcin Kuzminski <marcin@python-works.com> parents: 1113 diff changeset	735 return self.groups_with_parents, self.just_name
1113 c1eda8ec4a46 added clone_uri,api_key into models. Fixed models for mysql compatibilty Marcin Kuzminski <marcin@python-works.com> parents: 1088 diff changeset	736
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	737 @LazyProperty
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	738 def repo_path(self):
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	739 """
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	740 Returns base full path for that repository means where it actually
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	741 exists on a filesystem
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	742 """
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	743 q = Session().query(RhodeCodeUi).filter(RhodeCodeUi.ui_key ==
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	744 Repository.url_sep())
1727 8e9f51091229 fixed caching query on repos path Marcin Kuzminski <marcin@python-works.com> parents: 1723 diff changeset	745 q = q.options(FromCache("sql_cache_short", "repository_repo_path"))
1368 04b43168742d adde short cache for repo_path Marcin Kuzminski <marcin@python-works.com> parents: 1366 diff changeset	746 return q.one().ui_value
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	747
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	748 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	749 def repo_full_path(self):
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	750 p = [self.repo_path]
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	751 # we need to split the name by / since this is how we store the
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	752 # names in the database, but that eventually needs to be converted
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	753 # into a valid system path
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	754 p += self.repo_name.split(Repository.url_sep())
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	755 return os.path.join(*p)
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	756
2809 070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	757 @property
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	758 def cache_keys(self):
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	759 """
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	760 Returns associated cache keys for that repo
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	761 """
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	762 return CacheInvalidation.query()\
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	763 .filter(CacheInvalidation.cache_args == self.repo_name)\
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	764 .order_by(CacheInvalidation.cache_key)\
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	765 .all()
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	766
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	767 def get_new_name(self, repo_name):
1539 bd604cf75c5a fixes #260 Put repo in group, then move group to another group -> repo becomes unavailable Marcin Kuzminski <marcin@python-works.com> parents: 1538 diff changeset	768 """
bd604cf75c5a fixes #260 Put repo in group, then move group to another group -> repo becomes unavailable Marcin Kuzminski <marcin@python-works.com> parents: 1538 diff changeset	769 returns new full repository name based on assigned group and new new
1591 0b63a0d2cede Merge with upstream Nicolas VINOT <aeris@imirhil.fr> parents: 1576 1590 diff changeset	770
1539 bd604cf75c5a fixes #260 Put repo in group, then move group to another group -> repo becomes unavailable Marcin Kuzminski <marcin@python-works.com> parents: 1538 diff changeset	771 :param group_name:
bd604cf75c5a fixes #260 Put repo in group, then move group to another group -> repo becomes unavailable Marcin Kuzminski <marcin@python-works.com> parents: 1538 diff changeset	772 """
bd604cf75c5a fixes #260 Put repo in group, then move group to another group -> repo becomes unavailable Marcin Kuzminski <marcin@python-works.com> parents: 1538 diff changeset	773 path_prefix = self.group.full_path_splitted if self.group else []
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	774 return Repository.url_sep().join(path_prefix + [repo_name])
1539 bd604cf75c5a fixes #260 Put repo in group, then move group to another group -> repo becomes unavailable Marcin Kuzminski <marcin@python-works.com> parents: 1538 diff changeset	775
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	776 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	777 def _ui(self):
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	778 """
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	779 Creates an db based ui object for this repository
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	780 """
2982 78227b65a358 remove duplicated code for generating UI objects Marcin Kuzminski <marcin@python-works.com> parents: 2942 diff changeset	781 from rhodecode.lib.utils import make_ui
78227b65a358 remove duplicated code for generating UI objects Marcin Kuzminski <marcin@python-works.com> parents: 2942 diff changeset	782 return make_ui('db', clear_session=False)
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	783
1508 4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	784 @classmethod
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	785 def inject_ui(cls, repo, extras={}):
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	786 from rhodecode.lib.vcs.backends.hg import MercurialRepository
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	787 from rhodecode.lib.vcs.backends.git import GitRepository
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	788 required = (MercurialRepository, GitRepository)
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	789 if not isinstance(repo, required):
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	790 raise Exception('repo must be instance of %s' % required)
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	791
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	792 # inject ui extra param to log this action via push logger
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	793 for k, v in extras.items():
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	794 repo._repo.ui.setconfig('rhodecode_extras', k, v)
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	795
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	796 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	797 def is_valid(cls, repo_name):
1508 4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	798 """
4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	799 returns True if given repo name is a valid filesystem repository
1587 8898a79ac628 Implement all CRUD API operation for repo Nicolas VINOT <aeris@imirhil.fr> parents: 1586 diff changeset	800
1819 9451a569aee5 sphinx doc cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1818 diff changeset	801 :param cls:
9451a569aee5 sphinx doc cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1818 diff changeset	802 :param repo_name:
1508 4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	803 """
4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	804 from rhodecode.lib.utils import is_valid_repo
4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	805
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	806 return is_valid_repo(repo_name, cls.base_path())
1508 4aba7be311e8 API added checks for a valid repository on pull command Marcin Kuzminski <marcin@python-works.com> parents: 1500 diff changeset	807
2508 43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	808 def get_api_data(self):
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	809 """
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	810 Common function for generating repo api data
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	811
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	812 """
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	813 repo = self
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	814 data = dict(
2510 9059b2d91303 Change return paremeters for get_api_data in user and repo Marcin Kuzminski <marcin@python-works.com> parents: 2508 diff changeset	815 repo_id=repo.repo_id,
2508 43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	816 repo_name=repo.repo_name,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	817 repo_type=repo.repo_type,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	818 clone_uri=repo.clone_uri,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	819 private=repo.private,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	820 created_on=repo.created_on,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	821 description=repo.description,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	822 landing_rev=repo.landing_rev,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	823 owner=repo.user.username,
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	824 fork_of=repo.fork.repo_name if repo.fork else None
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	825 )
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	826
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	827 return data
43cb5b6047fd Added functions for getting API data to repo and user models Marcin Kuzminski <marcin@python-works.com> parents: 2506 diff changeset	828
2726 aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	829 @classmethod
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	830 def lock(cls, repo, user_id):
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	831 repo.locked = [user_id, time.time()]
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	832 Session().add(repo)
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	833 Session().commit()
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	834
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	835 @classmethod
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	836 def unlock(cls, repo):
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	837 repo.locked = None
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	838 Session().add(repo)
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	839 Session().commit()
aa17c7a1b8a5 Implemented basic locking functionality. Marcin Kuzminski <marcin@python-works.com> parents: 2724 diff changeset	840
2936 62e493c7f436 Added lightweight dashboard option. ref #500 Marcin Kuzminski <marcin@python-works.com> parents: 2835 diff changeset	841 @property
62e493c7f436 Added lightweight dashboard option. ref #500 Marcin Kuzminski <marcin@python-works.com> parents: 2835 diff changeset	842 def last_db_change(self):
62e493c7f436 Added lightweight dashboard option. ref #500 Marcin Kuzminski <marcin@python-works.com> parents: 2835 diff changeset	843 return self.updated_on
62e493c7f436 Added lightweight dashboard option. ref #500 Marcin Kuzminski <marcin@python-works.com> parents: 2835 diff changeset	844
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	845 #==========================================================================
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	846 # SCM PROPERTIES
ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	847 #==========================================================================
ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	848
2251 986430cde505 fixed issue with getting README files from git repositories Marcin Kuzminski <marcin@python-works.com> parents: 2248 diff changeset	849 def get_changeset(self, rev=None):
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	850 return get_changeset_safe(self.scm_instance, rev)
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	851
2603 370ed7829168 Readme renderer now uses landing_rev parameter to render the readme based on Marcin Kuzminski <marcin@python-works.com> parents: 2588 diff changeset	852 def get_landing_changeset(self):
370ed7829168 Readme renderer now uses landing_rev parameter to render the readme based on Marcin Kuzminski <marcin@python-works.com> parents: 2588 diff changeset	853 """
370ed7829168 Readme renderer now uses landing_rev parameter to render the readme based on Marcin Kuzminski <marcin@python-works.com> parents: 2588 diff changeset	854 Returns landing changeset, or if that doesn't exist returns the tip
370ed7829168 Readme renderer now uses landing_rev parameter to render the readme based on Marcin Kuzminski <marcin@python-works.com> parents: 2588 diff changeset	855 """
370ed7829168 Readme renderer now uses landing_rev parameter to render the readme based on Marcin Kuzminski <marcin@python-works.com> parents: 2588 diff changeset	856 cs = self.get_changeset(self.landing_rev) or self.get_changeset()
370ed7829168 Readme renderer now uses landing_rev parameter to render the readme based on Marcin Kuzminski <marcin@python-works.com> parents: 2588 diff changeset	857 return cs
370ed7829168 Readme renderer now uses landing_rev parameter to render the readme based on Marcin Kuzminski <marcin@python-works.com> parents: 2588 diff changeset	858
2937 d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	859 def update_last_change(self, last_change=None):
d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	860 if last_change is None:
d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	861 last_change = datetime.datetime.now()
d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	862 if self.updated_on is None or self.updated_on != last_change:
d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	863 log.debug('updated repo %s with new date %s' % (self, last_change))
d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	864 self.updated_on = last_change
d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	865 Session().add(self)
d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	866 Session().commit()
d439d408b415 Update last_change from VCS data on request. Marcin Kuzminski <marcin@python-works.com> parents: 2936 diff changeset	867
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	868 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	869 def tip(self):
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	870 return self.get_changeset('tip')
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	871
ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	872 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	873 def author(self):
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	874 return self.tip.author
ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	875
ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	876 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	877 def last_change(self):
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	878 return self.scm_instance.last_change
ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	879
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	880 def get_comments(self, revisions=None):
1884 0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	881 """
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	882 Returns comments for this repository grouped by revisions
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	883
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	884 :param revisions: filter query by revisions only
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	885 """
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	886 cmts = ChangesetComment.query()\
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	887 .filter(ChangesetComment.repo == self)
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	888 if revisions:
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	889 cmts = cmts.filter(ChangesetComment.revision.in_(revisions))
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	890 grouped = defaultdict(list)
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	891 for cmt in cmts.all():
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	892 grouped[cmt.revision].append(cmt)
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	893 return grouped
0614862a20ec Added number of comments in changelog for each changeset Marcin Kuzminski <marcin@python-works.com> parents: 1824 diff changeset	894
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	895 def statuses(self, revisions=None):
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	896 """
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	897 Returns statuses for this repository
2217 76947224bf27 Implemented initial code-review status of changesets Marcin Kuzminski <marcin@python-works.com> parents: 2215 diff changeset	898
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	899 :param revisions: list of revisions to get statuses for
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	900 :type revisions: list
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	901 """
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	902
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	903 statuses = ChangesetStatus.query()\
2287 8447d35b674e Added simple versioning for changeset status Marcin Kuzminski <marcin@python-works.com> parents: 2286 diff changeset	904 .filter(ChangesetStatus.repo == self)\
8447d35b674e Added simple versioning for changeset status Marcin Kuzminski <marcin@python-works.com> parents: 2286 diff changeset	905 .filter(ChangesetStatus.version == 0)
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	906 if revisions:
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	907 statuses = statuses.filter(ChangesetStatus.revision.in_(revisions))
2217 76947224bf27 Implemented initial code-review status of changesets Marcin Kuzminski <marcin@python-works.com> parents: 2215 diff changeset	908 grouped = {}
2542 4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	909
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	910 #maybe we have open new pullrequest without a status ?
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	911 stat = ChangesetStatus.STATUS_UNDER_REVIEW
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	912 status_lbl = ChangesetStatus.get_status_lbl(stat)
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	913 for pr in PullRequest.query().filter(PullRequest.org_repo == self).all():
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	914 for rev in pr.revisions:
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	915 pr_id = pr.pull_request_id
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	916 pr_repo = pr.other_repo.repo_name
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	917 grouped[rev] = [stat, status_lbl, pr_id, pr_repo]
4496d3119627 mock changeset status(to under review) if there's opened pull request but not yet with a status Marcin Kuzminski <marcin@python-works.com> parents: 2532 diff changeset	918
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	919 for stat in statuses.all():
2443 fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	920 pr_id = pr_repo = None
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	921 if stat.pull_request:
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	922 pr_id = stat.pull_request.pull_request_id
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	923 pr_repo = stat.pull_request.other_repo.repo_name
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	924 grouped[stat.revision] = [str(stat.status), stat.status_lbl,
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	925 pr_id, pr_repo]
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	926 return grouped
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	927
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	928 #==========================================================================
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	929 # SCM CACHE INSTANCE
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	930 #==========================================================================
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	931
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	932 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	933 def invalidate(self):
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	934 return CacheInvalidation.invalidate(self.repo_name)
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	935
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	936 def set_invalidate(self):
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	937 """
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	938 set a cache for invalidation for this instance
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	939 """
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	940 CacheInvalidation.set_invalidate(self.repo_name)
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	941
1466 ad5a543a9b2f Code cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1460 diff changeset	942 @LazyProperty
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	943 def scm_instance(self):
1400 0d7b56b97953 Simplified last_login call on user, and changed login to use User model directly Marcin Kuzminski <marcin@python-works.com> parents: 1388 diff changeset	944 return self.__get_instance()
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	945
2352 90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	946 def scm_instance_cached(self, cache_map=None):
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	947 @cache_region('long_term')
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	948 def _c(repo_name):
1400 0d7b56b97953 Simplified last_login call on user, and changed login to use User model directly Marcin Kuzminski <marcin@python-works.com> parents: 1388 diff changeset	949 return self.__get_instance()
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	950 rn = self.repo_name
1744 d41a115d9a39 remove cache from default perms. In some cases of concurrent repo removal it crashed. Marcin Kuzminski <marcin@python-works.com> parents: 1733 diff changeset	951 log.debug('Getting cached instance of repo')
2352 90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	952
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	953 if cache_map:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	954 # get using prefilled cache_map
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	955 invalidate_repo = cache_map[self.repo_name]
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	956 if invalidate_repo:
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	957 invalidate_repo = (None if invalidate_repo.cache_active
2352 90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	958 else invalidate_repo)
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	959 else:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	960 # get from invalidate
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	961 invalidate_repo = self.invalidate
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	962
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	963 if invalidate_repo is not None:
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	964 region_invalidate(_c, None, rn)
1428 e5467730682b fixed some issues with cache invalidation, and simplified invalidation codes Marcin Kuzminski <marcin@python-works.com> parents: 1427 diff changeset	965 # update our cache
2352 90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	966 CacheInvalidation.set_valid(invalidate_repo.cache_key)
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	967 return _c(rn)
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	968
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	969 def __get_instance(self):
1368 04b43168742d adde short cache for repo_path Marcin Kuzminski <marcin@python-works.com> parents: 1366 diff changeset	970 repo_full_path = self.repo_full_path
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	971 try:
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	972 alias = get_scm(repo_full_path)[0]
1976 a76e9bacbedc garden Marcin Kuzminski <marcin@python-works.com> parents: 1963 diff changeset	973 log.debug('Creating instance of %s repository' % alias)
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	974 backend = get_backend(alias)
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	975 except VCSError:
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	976 log.error(traceback.format_exc())
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	977 log.error('Perhaps this repository is in db and not in '
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	978 'filesystem run rescan repositories with '
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	979 '"destroy old data " option from admin panel')
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	980 return
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	981
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	982 if alias == 'hg':
2000 72c525a7e7ad added migrations from 1.2.X to 1.3 Marcin Kuzminski <marcin@python-works.com> parents: 1990 diff changeset	983
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	984 repo = backend(safe_str(repo_full_path), create=False,
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	985 baseui=self._ui)
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	986 # skip hidden web repository
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	987 if repo._get_hidden():
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	988 return
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	989 else:
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	990 repo = backend(repo_full_path, create=False)
1366 9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	991
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	992 return repo
9c0f5d558789 fixes #200, rewrote the whole caching mechanism to get rid of such problems. Now cached instances are attached Marcin Kuzminski <marcin@python-works.com> parents: 1360 diff changeset	993
1065 5d676b6ab71c Moved BaseModel into base class for declarative base. Added some handy methods into Marcin Kuzminski <marcin@python-works.com> parents: 1039 diff changeset	994
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	995 class RepoGroup(Base, BaseModel):
878 859bc9e7a15d Extended repo2db mapper with group creation via directory structures Marcin Kuzminski <marcin@python-works.com> parents: 836 diff changeset	996 __tablename__ = 'groups'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	997 __table_args__ = (
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	998 UniqueConstraint('group_name', 'group_parent_id'),
1963 9bbde54232dc white space cleanup Marcin Kuzminski <marcin@python-works.com> parents: 1960 diff changeset	999 CheckConstraint('group_id != group_parent_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1000 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1001 'mysql_charset': 'utf8'},
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1002 )
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1003 __mapper_args__ = {'order_by': 'group_name'}
878 859bc9e7a15d Extended repo2db mapper with group creation via directory structures Marcin Kuzminski <marcin@python-works.com> parents: 836 diff changeset	1004
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1005 group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1006 group_name = Column("group_name", String(255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1007 group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1008 group_description = Column("group_description", String(10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
2749 3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1009 enable_locking = Column("enable_locking", Boolean(), nullable=False, unique=None, default=False)
878 859bc9e7a15d Extended repo2db mapper with group creation via directory structures Marcin Kuzminski <marcin@python-works.com> parents: 836 diff changeset	1010
1982 87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1011 repo_group_to_perm = relationship('UserRepoGroupToPerm', cascade='all', order_by='UserRepoGroupToPerm.group_to_perm_id')
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1012 users_group_to_perm = relationship('UsersGroupRepoGroupToPerm', cascade='all')
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1013
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1014 parent_group = relationship('RepoGroup', remote_side=group_id)
878 859bc9e7a15d Extended repo2db mapper with group creation via directory structures Marcin Kuzminski <marcin@python-works.com> parents: 836 diff changeset	1015
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1016 def __init__(self, group_name='', parent_group=None):
878 859bc9e7a15d Extended repo2db mapper with group creation via directory structures Marcin Kuzminski <marcin@python-works.com> parents: 836 diff changeset	1017 self.group_name = group_name
859bc9e7a15d Extended repo2db mapper with group creation via directory structures Marcin Kuzminski <marcin@python-works.com> parents: 836 diff changeset	1018 self.parent_group = parent_group
859bc9e7a15d Extended repo2db mapper with group creation via directory structures Marcin Kuzminski <marcin@python-works.com> parents: 836 diff changeset	1019
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1020 def __unicode__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1021 return u"<%s('%s:%s')>" % (self.__class__.__name__, self.group_id,
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1022 self.group_name)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	1023
1346 cf78d302d441 #47 implemented deleting of empty groups. Fixed problem with full paths on nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1345 diff changeset	1024 @classmethod
2835 faffec4abbda Implemented permissions for writing to repo Marcin Kuzminski <marcin@python-works.com> parents: 2821 diff changeset	1025 def groups_choices(cls, check_perms=False):
1547 fbc762ae3496 unified generation of repo groups choices Marcin Kuzminski <marcin@python-works.com> parents: 1546 diff changeset	1026 from webhelpers.html import literal as _literal
2835 faffec4abbda Implemented permissions for writing to repo Marcin Kuzminski <marcin@python-works.com> parents: 2821 diff changeset	1027 from rhodecode.model.scm import ScmModel
faffec4abbda Implemented permissions for writing to repo Marcin Kuzminski <marcin@python-works.com> parents: 2821 diff changeset	1028 groups = cls.query().all()
faffec4abbda Implemented permissions for writing to repo Marcin Kuzminski <marcin@python-works.com> parents: 2821 diff changeset	1029 if check_perms:
faffec4abbda Implemented permissions for writing to repo Marcin Kuzminski <marcin@python-works.com> parents: 2821 diff changeset	1030 #filter group user have access to, it's done
faffec4abbda Implemented permissions for writing to repo Marcin Kuzminski <marcin@python-works.com> parents: 2821 diff changeset	1031 #magically inside ScmModel based on current user
faffec4abbda Implemented permissions for writing to repo Marcin Kuzminski <marcin@python-works.com> parents: 2821 diff changeset	1032 groups = ScmModel().get_repos_groups(groups)
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1033 repo_groups = [('', '')]
1547 fbc762ae3496 unified generation of repo groups choices Marcin Kuzminski <marcin@python-works.com> parents: 1546 diff changeset	1034 sep = ' » '
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1035 _name = lambda k: _literal(sep.join(k))
1547 fbc762ae3496 unified generation of repo groups choices Marcin Kuzminski <marcin@python-works.com> parents: 1546 diff changeset	1036
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1037 repo_groups.extend([(x.group_id, _name(x.full_path_splitted))
2835 faffec4abbda Implemented permissions for writing to repo Marcin Kuzminski <marcin@python-works.com> parents: 2821 diff changeset	1038 for x in groups])
1591 0b63a0d2cede Merge with upstream Nicolas VINOT <aeris@imirhil.fr> parents: 1576 1590 diff changeset	1039
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1040 repo_groups = sorted(repo_groups, key=lambda t: t[1].split(sep)[0])
1547 fbc762ae3496 unified generation of repo groups choices Marcin Kuzminski <marcin@python-works.com> parents: 1546 diff changeset	1041 return repo_groups
1591 0b63a0d2cede Merge with upstream Nicolas VINOT <aeris@imirhil.fr> parents: 1576 1590 diff changeset	1042
1547 fbc762ae3496 unified generation of repo groups choices Marcin Kuzminski <marcin@python-works.com> parents: 1546 diff changeset	1043 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1044 def url_sep(cls):
2339 79b3c9c66c54 Added optional repo_name into issue tracker url to get just the name of repo without group prefix Marcin Kuzminski <marcin@python-works.com> parents: 2251 diff changeset	1045 return URL_SEP
1346 cf78d302d441 #47 implemented deleting of empty groups. Fixed problem with full paths on nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1345 diff changeset	1046
1538 27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1047 @classmethod
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1048 def get_by_group_name(cls, group_name, cache=False, case_insensitive=False):
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	1049 if case_insensitive:
3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	1050 gr = cls.query()\
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1051 .filter(cls.group_name.ilike(group_name))
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	1052 else:
3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	1053 gr = cls.query()\
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1054 .filter(cls.group_name == group_name)
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	1055 if cache:
2062 bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	1056 gr = gr.options(FromCache(
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	1057 "sql_cache_short",
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	1058 "get_group_%s" % _hash_key(group_name)
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	1059 )
bf8ed0adbc66 fixes #371 fixed issues with beaker/sqlalchemy and non-ascii cache keys Marcin Kuzminski <marcin@python-works.com> parents: 2058 diff changeset	1060 )
1584 3338a0994472 Improve API with user/group/repo CRUD methods Nicolas VINOT <aeris@imirhil.fr> parents: 1508 diff changeset	1061 return gr.scalar()
1538 27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1062
1159 187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1063 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1064 def parents(self):
1385 7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1065 parents_recursion_limit = 5
1159 187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1066 groups = []
187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1067 if self.parent_group is None:
187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1068 return groups
187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1069 cur_gr = self.parent_group
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1070 groups.insert(0, cur_gr)
1349 526120c77a38 #47 added editing of groups, and moving them between. Added check constraint for groups Marcin Kuzminski <marcin@python-works.com> parents: 1346 diff changeset	1071 cnt = 0
1159 187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1072 while 1:
1349 526120c77a38 #47 added editing of groups, and moving them between. Added check constraint for groups Marcin Kuzminski <marcin@python-works.com> parents: 1346 diff changeset	1073 cnt += 1
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1074 gr = getattr(cur_gr, 'parent_group', None)
1159 187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1075 cur_gr = cur_gr.parent_group
187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1076 if gr is None:
187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1077 break
1385 7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1078 if cnt == parents_recursion_limit:
1349 526120c77a38 #47 added editing of groups, and moving them between. Added check constraint for groups Marcin Kuzminski <marcin@python-works.com> parents: 1346 diff changeset	1079 # this will prevent accidental infinit loops
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1080 log.error('group nested more than %s' %
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1081 parents_recursion_limit)
1349 526120c77a38 #47 added editing of groups, and moving them between. Added check constraint for groups Marcin Kuzminski <marcin@python-works.com> parents: 1346 diff changeset	1082 break
526120c77a38 #47 added editing of groups, and moving them between. Added check constraint for groups Marcin Kuzminski <marcin@python-works.com> parents: 1346 diff changeset	1083
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1084 groups.insert(0, gr)
1159 187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1085 return groups
187a924ed653 Changes for repo groups Marcin Kuzminski <marcin@python-works.com> parents: 1155 diff changeset	1086
1385 7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1087 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1088 def children(self):
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1089 return RepoGroup.query().filter(RepoGroup.parent_group == self)
1323 a7a772ea7b95 fixed saving settings on repositories inside groups, also fixes #187 Marcin Kuzminski <marcin@python-works.com> parents: 1301 diff changeset	1090
a7a772ea7b95 fixed saving settings on repositories inside groups, also fixes #187 Marcin Kuzminski <marcin@python-works.com> parents: 1301 diff changeset	1091 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1092 def name(self):
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1093 return self.group_name.split(RepoGroup.url_sep())[-1]
1538 27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1094
27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1095 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1096 def full_path(self):
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1097 return self.group_name
1538 27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1098
27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1099 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1100 def full_path_splitted(self):
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1101 return self.group_name.split(RepoGroup.url_sep())
1323 a7a772ea7b95 fixed saving settings on repositories inside groups, also fixes #187 Marcin Kuzminski <marcin@python-works.com> parents: 1301 diff changeset	1102
1193 523382549c45 Added repo group page showing what reposiories are inside a group Marcin Kuzminski <marcin@python-works.com> parents: 1159 diff changeset	1103 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1104 def repositories(self):
2079 477fe54b8af8 fixed sorting of repos in group Marcin Kuzminski <marcin@python-works.com> parents: 2063 diff changeset	1105 return Repository.query()\
477fe54b8af8 fixed sorting of repos in group Marcin Kuzminski <marcin@python-works.com> parents: 2063 diff changeset	1106 .filter(Repository.group == self)\
477fe54b8af8 fixed sorting of repos in group Marcin Kuzminski <marcin@python-works.com> parents: 2063 diff changeset	1107 .order_by(Repository.repo_name)
1193 523382549c45 Added repo group page showing what reposiories are inside a group Marcin Kuzminski <marcin@python-works.com> parents: 1159 diff changeset	1108
1385 7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1109 @property
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1110 def repositories_recursive_count(self):
1385 7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1111 cnt = self.repositories.count()
7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1112
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1113 def children_count(group):
1385 7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1114 cnt = 0
7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1115 for child in group.children:
7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1116 cnt += child.repositories.count()
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1117 cnt += children_count(child)
1385 7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1118 return cnt
7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1119
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1120 return cnt + children_count(self)
1385 7e221629a3e5 #209 Added recursive count on repositories to calculate all repos within all nested groups Marcin Kuzminski <marcin@python-works.com> parents: 1381 diff changeset	1121
2749 3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1122 def recursive_groups_and_repos(self):
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1123 """
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1124 Recursive return all groups, with repositories in those groups
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1125 """
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1126 all_ = []
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1127
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1128 def _get_members(root_gr):
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1129 for r in root_gr.repositories:
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1130 all_.append(r)
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1131 childs = root_gr.children.all()
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1132 if childs:
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1133 for gr in childs:
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1134 all_.append(gr)
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1135 _get_members(gr)
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1136
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1137 _get_members(self)
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1138 return [self] + all_
3ed4dae499d0 Recursive set locking on all children of a group. Marcin Kuzminski <marcin@python-works.com> parents: 2731 diff changeset	1139
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1140 def get_new_name(self, group_name):
1538 27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1141 """
27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1142 returns new full group name based on parent and new name
1591 0b63a0d2cede Merge with upstream Nicolas VINOT <aeris@imirhil.fr> parents: 1576 1590 diff changeset	1143
1538 27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1144 :param group_name:
27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1145 """
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1146 path_prefix = (self.parent_group.full_path_splitted if
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1147 self.parent_group else [])
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1148 return RepoGroup.url_sep().join(path_prefix + [group_name])
1538 27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1149
27be8f94c207 implements #226 repo groups available by path Marcin Kuzminski <marcin@python-works.com> parents: 1530 diff changeset	1150
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1151 class Permission(Base, BaseModel):
226 c6526b7531e9 rewritten db manage script to use sqlalchemy. Fixed sqlalchemy models to more generic. Marcin Kuzminski <marcin@python-works.com> parents: 89 diff changeset	1152 __tablename__ = 'permissions'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1153 __table_args__ = (
2463 b426ecc30319 Added some DB indexes to optimize queries Marcin Kuzminski <marcin@python-works.com> parents: 2462 diff changeset	1154 Index('p_perm_name_idx', 'permission_name'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1155 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1156 'mysql_charset': 'utf8'},
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1157 )
2532 19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1158 PERMS = [
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1159 ('repository.none', _('Repository no access')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1160 ('repository.read', _('Repository read access')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1161 ('repository.write', _('Repository write access')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1162 ('repository.admin', _('Repository admin access')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1163
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1164 ('group.none', _('Repositories Group no access')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1165 ('group.read', _('Repositories Group read access')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1166 ('group.write', _('Repositories Group write access')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1167 ('group.admin', _('Repositories Group admin access')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1168
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1169 ('hg.admin', _('RhodeCode Administrator')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1170 ('hg.create.none', _('Repository creation disabled')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1171 ('hg.create.repository', _('Repository creation enabled')),
2709 d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1172 ('hg.fork.none', _('Repository forking disabled')),
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1173 ('hg.fork.repository', _('Repository forking enabled')),
2532 19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1174 ('hg.register.none', _('Register disabled')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1175 ('hg.register.manual_activate', _('Register new user with RhodeCode '
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1176 'with manual activation')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1177
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1178 ('hg.register.auto_activate', _('Register new user with RhodeCode '
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1179 'with auto activation')),
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1180 ]
19de74e33fb0 Better descriptions of given permission overview in edit user view Marcin Kuzminski <marcin@python-works.com> parents: 2531 diff changeset	1181
2709 d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1182 # defines which permissions are more important higher the more important
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1183 PERM_WEIGHTS = {
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1184 'repository.none': 0,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1185 'repository.read': 1,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1186 'repository.write': 3,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1187 'repository.admin': 4,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1188
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1189 'group.none': 0,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1190 'group.read': 1,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1191 'group.write': 3,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1192 'group.admin': 4,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1193
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1194 'hg.fork.none': 0,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1195 'hg.fork.repository': 1,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1196 'hg.create.none': 0,
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1197 'hg.create.repository':1
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1198 }
d2d35cf2b351 RhodeCode now has a option to explicitly set forking permissions. ref #508 Marcin Kuzminski <marcin@python-works.com> parents: 2708 diff changeset	1199
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1200 permission_id = Column("permission_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1201 permission_name = Column("permission_name", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1202 permission_longname = Column("permission_longname", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	1203
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1204 def __unicode__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1205 return u"<%s('%s:%s')>" % (
1982 87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1206 self.__class__.__name__, self.permission_id, self.permission_name
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1207 )
296 29370bb76fa6 first permissions commit: added permission managment on repository edit. Changed db rmissions, validators. Marcin Kuzminski <marcin@python-works.com> parents: 265 diff changeset	1208
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	1209 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1210 def get_by_key(cls, key):
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1211 return cls.query().filter(cls.permission_name == key).scalar()
1266 a1bcfe58a1ab Fixed #161 form saves the create repository permission. Marcin Kuzminski <marcin@python-works.com> parents: 1206 diff changeset	1212
1728 07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	1213 @classmethod
1744 d41a115d9a39 remove cache from default perms. In some cases of concurrent repo removal it crashed. Marcin Kuzminski <marcin@python-works.com> parents: 1733 diff changeset	1214 def get_default_perms(cls, default_user_id):
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1215 q = Session().query(UserRepoToPerm, Repository, cls)\
1982 87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1216 .join((Repository, UserRepoToPerm.repository_id == Repository.repo_id))\
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1217 .join((cls, UserRepoToPerm.permission_id == cls.permission_id))\
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1218 .filter(UserRepoToPerm.user_id == default_user_id)
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1219
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1220 return q.all()
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1221
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1222 @classmethod
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1223 def get_default_group_perms(cls, default_user_id):
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1224 q = Session().query(UserRepoGroupToPerm, RepoGroup, cls)\
1982 87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1225 .join((RepoGroup, UserRepoGroupToPerm.group_id == RepoGroup.group_id))\
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1226 .join((cls, UserRepoGroupToPerm.permission_id == cls.permission_id))\
87f0800abc7b #227 Initial version of repository groups permissions system Marcin Kuzminski <marcin@python-works.com> parents: 1976 diff changeset	1227 .filter(UserRepoGroupToPerm.user_id == default_user_id)
1728 07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	1228
07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	1229 return q.all()
07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	1230
07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	1231
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1232 class UserRepoToPerm(Base, BaseModel):
296 29370bb76fa6 first permissions commit: added permission managment on repository edit. Changed db rmissions, validators. Marcin Kuzminski <marcin@python-works.com> parents: 265 diff changeset	1233 __tablename__ = 'repo_to_perm'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1234 __table_args__ = (
2000 72c525a7e7ad added migrations from 1.2.X to 1.3 Marcin Kuzminski <marcin@python-works.com> parents: 1990 diff changeset	1235 UniqueConstraint('user_id', 'repository_id', 'permission_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1236 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1237 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1238 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1239 repo_to_perm_id = Column("repo_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1240 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1241 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1242 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	1243
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1244 user = relationship('User')
2000 72c525a7e7ad added migrations from 1.2.X to 1.3 Marcin Kuzminski <marcin@python-works.com> parents: 1990 diff changeset	1245 repository = relationship('Repository')
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1246 permission = relationship('Permission')
399 f5c1eec9f376 rename repo2perm into repo_to_perm Marcin Kuzminski <marcin@python-works.com> parents: 392 diff changeset	1247
1729 da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1248 @classmethod
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1249 def create(cls, user, repository, permission):
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1250 n = cls()
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1251 n.user = user
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1252 n.repository = repository
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1253 n.permission = permission
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1254 Session().add(n)
1729 da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1255 return n
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1256
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1257 def __unicode__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1258 return u'<user:%s => %s >' % (self.user, self.repository)
1729 da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1259
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	1260
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1261 class UserToPerm(Base, BaseModel):
399 f5c1eec9f376 rename repo2perm into repo_to_perm Marcin Kuzminski <marcin@python-works.com> parents: 392 diff changeset	1262 __tablename__ = 'user_to_perm'
1988 5eae67552695 db unique constraints fixes Marcin Kuzminski <marcin@python-works.com> parents: 1982 diff changeset	1263 __table_args__ = (
5eae67552695 db unique constraints fixes Marcin Kuzminski <marcin@python-works.com> parents: 1982 diff changeset	1264 UniqueConstraint('user_id', 'permission_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1265 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1266 'mysql_charset': 'utf8'}
1988 5eae67552695 db unique constraints fixes Marcin Kuzminski <marcin@python-works.com> parents: 1982 diff changeset	1267 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1268 user_to_perm_id = Column("user_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1269 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1270 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	1271
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1272 user = relationship('User')
1728 07e56179633e - fixes celery sqlalchemy session issues for async forking Marcin Kuzminski <marcin@python-works.com> parents: 1727 diff changeset	1273 permission = relationship('Permission', lazy='joined')
399 f5c1eec9f376 rename repo2perm into repo_to_perm Marcin Kuzminski <marcin@python-works.com> parents: 392 diff changeset	1274
1014 6fdc3ff65fce #56 added assignments of users groups into repository Marcin Kuzminski <marcin@python-works.com> parents: 1000 diff changeset	1275
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1276 class UsersGroupRepoToPerm(Base, BaseModel):
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	1277 __tablename__ = 'users_group_repo_to_perm'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1278 __table_args__ = (
2000 72c525a7e7ad added migrations from 1.2.X to 1.3 Marcin Kuzminski <marcin@python-works.com> parents: 1990 diff changeset	1279 UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1280 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1281 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1282 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1283 users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1284 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1285 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1286 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)
958 7d1483f3170b added user group to perm table Marcin Kuzminski <marcin@python-works.com> parents: 956 diff changeset	1287
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1288 users_group = relationship('UsersGroup')
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1289 permission = relationship('Permission')
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1290 repository = relationship('Repository')
958 7d1483f3170b added user group to perm table Marcin Kuzminski <marcin@python-works.com> parents: 956 diff changeset	1291
1729 da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1292 @classmethod
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1293 def create(cls, users_group, repository, permission):
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1294 n = cls()
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1295 n.users_group = users_group
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1296 n.repository = repository
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1297 n.permission = permission
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1298 Session().add(n)
1729 da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1299 return n
da8ee2ef7f6d implements #236 forking copy permission option Marcin Kuzminski <marcin@python-works.com> parents: 1728 diff changeset	1300
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1301 def __unicode__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1302 return u'<userGroup:%s => %s >' % (self.users_group, self.repository)
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	1303
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	1304
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1305 class UsersGroupToPerm(Base, BaseModel):
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	1306 __tablename__ = 'users_group_to_perm'
1988 5eae67552695 db unique constraints fixes Marcin Kuzminski <marcin@python-works.com> parents: 1982 diff changeset	1307 __table_args__ = (
5eae67552695 db unique constraints fixes Marcin Kuzminski <marcin@python-works.com> parents: 1982 diff changeset	1308 UniqueConstraint('users_group_id', 'permission_id',),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1309 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1310 'mysql_charset': 'utf8'}
1988 5eae67552695 db unique constraints fixes Marcin Kuzminski <marcin@python-works.com> parents: 1982 diff changeset	1311 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1312 users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1313 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1314 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	1315
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1316 users_group = relationship('UsersGroup')
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1317 permission = relationship('Permission')
1271 aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	1318
aa7e45ad0cea Fixed permissions for users groups, group can have create repo permission now. Marcin Kuzminski <marcin@python-works.com> parents: 1266 diff changeset	1319
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1320 class UserRepoGroupToPerm(Base, BaseModel):
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1321 __tablename__ = 'user_repo_group_to_perm'
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1322 __table_args__ = (
2000 72c525a7e7ad added migrations from 1.2.X to 1.3 Marcin Kuzminski <marcin@python-works.com> parents: 1990 diff changeset	1323 UniqueConstraint('user_id', 'group_id', 'permission_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1324 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1325 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1326 )
879 b19341623d48 added group to perm mapping table Marcin Kuzminski <marcin@python-works.com> parents: 878 diff changeset	1327
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1328 group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1329 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1330 group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1331 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
879 b19341623d48 added group to perm mapping table Marcin Kuzminski <marcin@python-works.com> parents: 878 diff changeset	1332
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1333 user = relationship('User')
2000 72c525a7e7ad added migrations from 1.2.X to 1.3 Marcin Kuzminski <marcin@python-works.com> parents: 1990 diff changeset	1334 group = relationship('RepoGroup')
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1335 permission = relationship('Permission')
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1336
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	1337
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1338 class UsersGroupRepoGroupToPerm(Base, BaseModel):
2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1339 __tablename__ = 'users_group_repo_group_to_perm'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1340 __table_args__ = (
1988 5eae67552695 db unique constraints fixes Marcin Kuzminski <marcin@python-works.com> parents: 1982 diff changeset	1341 UniqueConstraint('users_group_id', 'group_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1342 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1343 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1344 )
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1345
2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1346 users_group_repo_group_to_perm_id = Column("users_group_repo_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1347 users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
1988 5eae67552695 db unique constraints fixes Marcin Kuzminski <marcin@python-works.com> parents: 1982 diff changeset	1348 group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
1633 2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1349 permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1350
2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1351 users_group = relationship('UsersGroup')
2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1352 permission = relationship('Permission')
2c0d35e336b5 refactoring of models names for repoGroup permissions Marcin Kuzminski <marcin@python-works.com> parents: 1607 diff changeset	1353 group = relationship('RepoGroup')
879 b19341623d48 added group to perm mapping table Marcin Kuzminski <marcin@python-works.com> parents: 878 diff changeset	1354
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	1355
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1356 class Statistics(Base, BaseModel):
493 2256c78afe53 implemented basic autoupdating statistics fetched from database Marcin Kuzminski <marcin@python-works.com> parents: 473 diff changeset	1357 __tablename__ = 'statistics'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1358 __table_args__ = (
2150 a8c9c0094ddf White space cleanup Marcin Kuzminski <marcin@python-works.com> parents: 2149 diff changeset	1359 UniqueConstraint('repository_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1360 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1361 'mysql_charset': 'utf8'}
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1362 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1363 stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1364 repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1365 stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1366 commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1367 commit_activity_combined = Column("commit_activity_combined", LargeBinary(), nullable=False)#JSON data
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1368 languages = Column("languages", LargeBinary(1000000), nullable=False)#JSON data
631 05528ad948c4 Hacking for git support,and new faster repo scan Marcin Kuzminski <marcin@python-works.com> parents: 549 diff changeset	1369
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1370 repository = relationship('Repository', single_parent=True)
399 f5c1eec9f376 rename repo2perm into repo_to_perm Marcin Kuzminski <marcin@python-works.com> parents: 392 diff changeset	1371
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	1372
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1373 class UserFollowing(Base, BaseModel):
734 49eb69d78988 implemented user dashboards, and following system. Marcin Kuzminski <marcin@python-works.com> parents: 713 diff changeset	1374 __tablename__ = 'user_followings'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1375 __table_args__ = (
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1376 UniqueConstraint('user_id', 'follows_repository_id'),
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1377 UniqueConstraint('user_id', 'follows_user_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1378 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1379 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1380 )
734 49eb69d78988 implemented user dashboards, and following system. Marcin Kuzminski <marcin@python-works.com> parents: 713 diff changeset	1381
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1382 user_following_id = Column("user_following_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1383 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1384 follows_repo_id = Column("follows_repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1385 follows_user_id = Column("follows_user_id", Integer(), ForeignKey('users.user_id'), nullable=True, unique=None, default=None)
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1386 follows_from = Column('follows_from', DateTime(timezone=False), nullable=True, unique=None, default=datetime.datetime.now)
734 49eb69d78988 implemented user dashboards, and following system. Marcin Kuzminski <marcin@python-works.com> parents: 713 diff changeset	1387
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1388 user = relationship('User', primaryjoin='User.user_id==UserFollowing.user_id')
734 49eb69d78988 implemented user dashboards, and following system. Marcin Kuzminski <marcin@python-works.com> parents: 713 diff changeset	1389
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1390 follows_user = relationship('User', primaryjoin='User.user_id==UserFollowing.follows_user_id')
9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1391 follows_repository = relationship('Repository', order_by='Repository.repo_name')
734 49eb69d78988 implemented user dashboards, and following system. Marcin Kuzminski <marcin@python-works.com> parents: 713 diff changeset	1392
1279 cb216757a62d #179 Added followers page Marcin Kuzminski <marcin@python-works.com> parents: 1271 diff changeset	1393 @classmethod
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1394 def get_repo_followers(cls, repo_id):
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1395 return cls.query().filter(cls.follows_repo_id == repo_id)
1279 cb216757a62d #179 Added followers page Marcin Kuzminski <marcin@python-works.com> parents: 1271 diff changeset	1396
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	1397
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1398 class CacheInvalidation(Base, BaseModel):
670 e7c670cc03cb Adde table for cache invalidation Marcin Kuzminski <marcin@python-works.com> parents: 667 diff changeset	1399 __tablename__ = 'cache_invalidation'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1400 __table_args__ = (
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1401 UniqueConstraint('cache_key'),
2352 90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1402 Index('key_idx', 'cache_key'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1403 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1404 'mysql_charset': 'utf8'},
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1405 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1406 cache_id = Column("cache_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1407 cache_key = Column("cache_key", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1408 cache_args = Column("cache_args", String(255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1409 cache_active = Column("cache_active", Boolean(), nullable=True, unique=None, default=False)
670 e7c670cc03cb Adde table for cache invalidation Marcin Kuzminski <marcin@python-works.com> parents: 667 diff changeset	1410
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1411 def __init__(self, cache_key, cache_args=''):
692 cb0d9ce6ac5c #50 on point cache invalidation changes. Marcin Kuzminski <marcin@python-works.com> parents: 670 diff changeset	1412 self.cache_key = cache_key
cb0d9ce6ac5c #50 on point cache invalidation changes. Marcin Kuzminski <marcin@python-works.com> parents: 670 diff changeset	1413 self.cache_args = cache_args
cb0d9ce6ac5c #50 on point cache invalidation changes. Marcin Kuzminski <marcin@python-works.com> parents: 670 diff changeset	1414 self.cache_active = False
cb0d9ce6ac5c #50 on point cache invalidation changes. Marcin Kuzminski <marcin@python-works.com> parents: 670 diff changeset	1415
2156 a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1416 def __unicode__(self):
a27e4d44237e Use __unicode__ instead of __repr__ in models. Marcin Kuzminski <marcin@python-works.com> parents: 2152 diff changeset	1417 return u"<%s('%s:%s')>" % (self.__class__.__name__,
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1418 self.cache_id, self.cache_key)
2352 90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1419
2809 070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	1420 @property
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	1421 def prefix(self):
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	1422 _split = self.cache_key.split(self.cache_args, 1)
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	1423 if _split and len(_split) == 2:
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	1424 return _split[0]
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	1425 return ''
070d2eacd48b Show cache keys in admin settings of repository Marcin Kuzminski <marcin@python-works.com> parents: 2808 diff changeset	1426
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1427 @classmethod
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1428 def clear_cache(cls):
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1429 cls.query().delete()
834 8924ed0e4f36 added current db version into rhodecode, Marcin Kuzminski <marcin@python-works.com> parents: 832 diff changeset	1430
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1431 @classmethod
2013 8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1432 def _get_key(cls, key):
8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1433 """
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1434 Wrapper for generating a key, together with a prefix
2013 8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1435
8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1436 :param key:
8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1437 """
2016 6020e3884a58 implements #212 moved default encoding variable into rhodecode-config. It's now possible to change Marcin Kuzminski <marcin@python-works.com> parents: 2013 diff changeset	1438 import rhodecode
6020e3884a58 implements #212 moved default encoding variable into rhodecode-config. It's now possible to change Marcin Kuzminski <marcin@python-works.com> parents: 2013 diff changeset	1439 prefix = ''
6020e3884a58 implements #212 moved default encoding variable into rhodecode-config. It's now possible to change Marcin Kuzminski <marcin@python-works.com> parents: 2013 diff changeset	1440 iid = rhodecode.CONFIG.get('instance_id')
6020e3884a58 implements #212 moved default encoding variable into rhodecode-config. It's now possible to change Marcin Kuzminski <marcin@python-works.com> parents: 2013 diff changeset	1441 if iid:
2058 fb51a6fc10ae updated CONTRIBUTORS Marcin Kuzminski <marcin@python-works.com> parents: 2016 diff changeset	1442 prefix = iid
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1443 return "%s%s" % (prefix, key), prefix, key.rstrip('_README')
2013 8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1444
8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1445 @classmethod
8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1446 def get_by_key(cls, key):
8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1447 return cls.query().filter(cls.cache_key == key).scalar()
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1448
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1449 @classmethod
2808 3a007d806f0f Fixing issues of cache invalidation for multiple instances running in rhodecode. Marcin Kuzminski <marcin@python-works.com> parents: 2798 diff changeset	1450 def _get_or_create_key(cls, key, prefix, org_key, commit=True):
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1451 inv_obj = Session().query(cls).filter(cls.cache_key == key).scalar()
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1452 if not inv_obj:
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1453 try:
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1454 inv_obj = CacheInvalidation(key, org_key)
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1455 Session().add(inv_obj)
2808 3a007d806f0f Fixing issues of cache invalidation for multiple instances running in rhodecode. Marcin Kuzminski <marcin@python-works.com> parents: 2798 diff changeset	1456 if commit:
3a007d806f0f Fixing issues of cache invalidation for multiple instances running in rhodecode. Marcin Kuzminski <marcin@python-works.com> parents: 2798 diff changeset	1457 Session().commit()
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1458 except Exception:
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1459 log.error(traceback.format_exc())
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1460 Session().rollback()
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1461 return inv_obj
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1462
2013 8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1463 @classmethod
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1464 def invalidate(cls, key):
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1465 """
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1466 Returns Invalidation object if this given key should be invalidated
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1467 None otherwise. `cache_active = False` means that this cache
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1468 state is not valid and needs to be invalidated
1818 cf51bbfb120e auto white-space removal Marcin Kuzminski <marcin@python-works.com> parents: 1800 diff changeset	1469
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1470 :param key:
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1471 """
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1472
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1473 key, _prefix, _org_key = cls._get_key(key)
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1474 inv = cls._get_or_create_key(key, _prefix, _org_key)
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1475
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1476 if inv and inv.cache_active is False:
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1477 return inv
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1478
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1479 @classmethod
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1480 def set_invalidate(cls, key):
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1481 """
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1482 Mark this Cache key for invalidation
1818 cf51bbfb120e auto white-space removal Marcin Kuzminski <marcin@python-works.com> parents: 1800 diff changeset	1483
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1484 :param key:
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1485 """
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1486
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1487 key, _prefix, _org_key = cls._get_key(key)
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1488 inv_objs = Session().query(cls).filter(cls.cache_args == _org_key).all()
2147 d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1489 log.debug('marking %s key[s] %s for invalidation' % (len(inv_objs),
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1490 _org_key))
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1491 try:
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1492 for inv_obj in inv_objs:
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1493 if inv_obj:
d25bd432bc3e - #347 when running multiple RhodeCode instances, properly invalidates cache Marcin Kuzminski <marcin@python-works.com> parents: 2109 diff changeset	1494 inv_obj.cache_active = False
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1495
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1496 Session().add(inv_obj)
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1497 Session().commit()
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1498 except Exception:
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1499 log.error(traceback.format_exc())
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1500 Session().rollback()
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1501
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1502 @classmethod
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1503 def set_valid(cls, key):
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1504 """
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1505 Mark this cache key as active and currently cached
1818 cf51bbfb120e auto white-space removal Marcin Kuzminski <marcin@python-works.com> parents: 1800 diff changeset	1506
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1507 :param key:
e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1508 """
2013 8530c3cd9d04 fixed issue with hybrid property for ldap_active Marcin Kuzminski <marcin@python-works.com> parents: 2007 diff changeset	1509 inv_obj = cls.get_by_key(key)
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1510 inv_obj.cache_active = True
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1511 Session().add(inv_obj)
a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1512 Session().commit()
1607 e886f91fcb71 Cached readme generation Marcin Kuzminski <marcin@python-works.com> parents: 1594 diff changeset	1513
2352 90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1514 @classmethod
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1515 def get_cache_map(cls):
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1516
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1517 class cachemapdict(dict):
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1518
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1519 def __init__(self, args, *kwargs):
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1520 fixkey = kwargs.get('fixkey')
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1521 if fixkey:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1522 del kwargs['fixkey']
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1523 self.fixkey = fixkey
2352 90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1524 super(cachemapdict, self).__init__(args, *kwargs)
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1525
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1526 def __getattr__(self, name):
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1527 key = name
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1528 if self.fixkey:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1529 key, _prefix, _org_key = cls._get_key(key)
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1530 if key in self.__dict__:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1531 return self.__dict__[key]
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1532 else:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1533 return self[key]
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1534
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1535 def __getitem__(self, key):
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1536 if self.fixkey:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1537 key, _prefix, _org_key = cls._get_key(key)
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1538 try:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1539 return super(cachemapdict, self).__getitem__(key)
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1540 except KeyError:
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1541 return
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1542
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1543 cache_map = cachemapdict(fixkey=True)
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1544 for obj in cls.query().all():
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1545 cache_map[obj.cache_key] = cachemapdict(obj.get_dict())
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1546 return cache_map
90e06f53af8c Implemented cache-map on main page to save executing select Marcin Kuzminski <marcin@python-works.com> parents: 2339 diff changeset	1547
1665 36f77a46f291 Added cache options to some db getters Marcin Kuzminski <marcin@python-works.com> parents: 1634 diff changeset	1548
1670 d2de0c2f02cd #77 code review Marcin Kuzminski <marcin@python-works.com> parents: 1669 diff changeset	1549 class ChangesetComment(Base, BaseModel):
d2de0c2f02cd #77 code review Marcin Kuzminski <marcin@python-works.com> parents: 1669 diff changeset	1550 __tablename__ = 'changeset_comments'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1551 __table_args__ = (
2463 b426ecc30319 Added some DB indexes to optimize queries Marcin Kuzminski <marcin@python-works.com> parents: 2462 diff changeset	1552 Index('cc_revision_idx', 'revision'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1553 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1554 'mysql_charset': 'utf8'},
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1555 )
1670 d2de0c2f02cd #77 code review Marcin Kuzminski <marcin@python-works.com> parents: 1669 diff changeset	1556 comment_id = Column('comment_id', Integer(), nullable=False, primary_key=True)
d2de0c2f02cd #77 code review Marcin Kuzminski <marcin@python-works.com> parents: 1669 diff changeset	1557 repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
2440 1bc579bcd67a - pull request generates overview based on it's params Marcin Kuzminski <marcin@python-works.com> parents: 2434 diff changeset	1558 revision = Column('revision', String(40), nullable=True)
1bc579bcd67a - pull request generates overview based on it's params Marcin Kuzminski <marcin@python-works.com> parents: 2434 diff changeset	1559 pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
1677 7276b170ce8b #71 code-review Marcin Kuzminski <marcin@python-works.com> parents: 1675 diff changeset	1560 line_no = Column('line_no', Unicode(10), nullable=True)
2724 29db53a79ab2 added highlight lines field in ChangesetComments, will be used Marcin Kuzminski <marcin@python-works.com> parents: 2709 diff changeset	1561 hl_lines = Column('hl_lines', Unicode(512), nullable=True)
1677 7276b170ce8b #71 code-review Marcin Kuzminski <marcin@python-works.com> parents: 1675 diff changeset	1562 f_path = Column('f_path', Unicode(1000), nullable=True)
1670 d2de0c2f02cd #77 code review Marcin Kuzminski <marcin@python-works.com> parents: 1669 diff changeset	1563 user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), nullable=False)
2791 85bb0866d444 UnicodeText make mysql more happy Marcin Kuzminski <marcin@python-works.com> parents: 2766 diff changeset	1564 text = Column('text', UnicodeText(25000), nullable=False)
2639 f3e039e4dc49 Added created_on column to changeset comments for proper ordering. Marcin Kuzminski <marcin@python-works.com> parents: 2608 diff changeset	1565 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
f3e039e4dc49 Added created_on column to changeset comments for proper ordering. Marcin Kuzminski <marcin@python-works.com> parents: 2608 diff changeset	1566 modified_at = Column('modified_at', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
1670 d2de0c2f02cd #77 code review Marcin Kuzminski <marcin@python-works.com> parents: 1669 diff changeset	1567
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1568 author = relationship('User', lazy='joined')
1670 d2de0c2f02cd #77 code review Marcin Kuzminski <marcin@python-works.com> parents: 1669 diff changeset	1569 repo = relationship('Repository')
2677 4fbbc65e8cd5 Forbid changing changset status when it is associated with a closed pull request Marcin Kuzminski <marcin@python-works.com> parents: 2674 diff changeset	1570 status_change = relationship('ChangesetStatus', cascade="all, delete, delete-orphan")
2440 1bc579bcd67a - pull request generates overview based on it's params Marcin Kuzminski <marcin@python-works.com> parents: 2434 diff changeset	1571 pull_request = relationship('PullRequest', lazy='joined')
1670 d2de0c2f02cd #77 code review Marcin Kuzminski <marcin@python-works.com> parents: 1669 diff changeset	1572
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1573 @classmethod
2443 fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1574 def get_users(cls, revision=None, pull_request_id=None):
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1575 """
2443 fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1576 Returns user associated with this ChangesetComment. ie those
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1577 who actually commented
1818 cf51bbfb120e auto white-space removal Marcin Kuzminski <marcin@python-works.com> parents: 1800 diff changeset	1578
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1579 :param cls:
f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1580 :param revision:
f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1581 """
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1582 q = Session().query(User)\
2443 fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1583 .join(ChangesetComment.author)
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1584 if revision:
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1585 q = q.filter(cls.revision == revision)
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1586 elif pull_request_id:
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1587 q = q.filter(cls.pull_request_id == pull_request_id)
fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1588 return q.all()
1886 50e32940e464 code garden Marcin Kuzminski <marcin@python-works.com> parents: 1884 diff changeset	1589
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1590
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1591 class ChangesetStatus(Base, BaseModel):
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1592 __tablename__ = 'changeset_statuses'
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1593 __table_args__ = (
2463 b426ecc30319 Added some DB indexes to optimize queries Marcin Kuzminski <marcin@python-works.com> parents: 2462 diff changeset	1594 Index('cs_revision_idx', 'revision'),
b426ecc30319 Added some DB indexes to optimize queries Marcin Kuzminski <marcin@python-works.com> parents: 2462 diff changeset	1595 Index('cs_version_idx', 'version'),
2287 8447d35b674e Added simple versioning for changeset status Marcin Kuzminski <marcin@python-works.com> parents: 2286 diff changeset	1596 UniqueConstraint('repo_id', 'revision', 'version'),
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1597 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1598 'mysql_charset': 'utf8'}
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1599 )
2481 4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1600 STATUS_NOT_REVIEWED = DEFAULT = 'not_reviewed'
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1601 STATUS_APPROVED = 'approved'
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1602 STATUS_REJECTED = 'rejected'
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1603 STATUS_UNDER_REVIEW = 'under_review'
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1604
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1605 STATUSES = [
2481 4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1606 (STATUS_NOT_REVIEWED, _("Not Reviewed")), # (no icon) and default
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1607 (STATUS_APPROVED, _("Approved")),
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1608 (STATUS_REJECTED, _("Rejected")),
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1609 (STATUS_UNDER_REVIEW, _("Under Review")),
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1610 ]
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1611
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1612 changeset_status_id = Column('changeset_status_id', Integer(), nullable=False, primary_key=True)
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1613 repo_id = Column('repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1614 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1615 revision = Column('revision', String(40), nullable=False)
2217 76947224bf27 Implemented initial code-review status of changesets Marcin Kuzminski <marcin@python-works.com> parents: 2215 diff changeset	1616 status = Column('status', String(128), nullable=False, default=DEFAULT)
2286 9265958e33bb Show changes of status inside comments Marcin Kuzminski <marcin@python-works.com> parents: 2280 diff changeset	1617 changeset_comment_id = Column('changeset_comment_id', Integer(), ForeignKey('changeset_comments.comment_id'))
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1618 modified_at = Column('modified_at', DateTime(), nullable=False, default=datetime.datetime.now)
2287 8447d35b674e Added simple versioning for changeset status Marcin Kuzminski <marcin@python-works.com> parents: 2286 diff changeset	1619 version = Column('version', Integer(), nullable=False, default=0)
2434 f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1620 pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=True)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1621
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1622 author = relationship('User', lazy='joined')
2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1623 repo = relationship('Repository')
2286 9265958e33bb Show changes of status inside comments Marcin Kuzminski <marcin@python-works.com> parents: 2280 diff changeset	1624 comment = relationship('ChangesetComment', lazy='joined')
2434 f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1625 pull_request = relationship('PullRequest', lazy='joined')
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1626
2481 4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1627 def __unicode__(self):
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1628 return u"<%s('%s:%s')>" % (
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1629 self.__class__.__name__,
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1630 self.status, self.author
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1631 )
4d3032431d4f Adde pull request voting recalculation Marcin Kuzminski <marcin@python-works.com> parents: 2480 diff changeset	1632
2296 e5c0f201ca0b Add changeset status change into emails Marcin Kuzminski <marcin@python-works.com> parents: 2287 diff changeset	1633 @classmethod
e5c0f201ca0b Add changeset status change into emails Marcin Kuzminski <marcin@python-works.com> parents: 2287 diff changeset	1634 def get_status_lbl(cls, value):
e5c0f201ca0b Add changeset status change into emails Marcin Kuzminski <marcin@python-works.com> parents: 2287 diff changeset	1635 return dict(cls.STATUSES).get(value)
e5c0f201ca0b Add changeset status change into emails Marcin Kuzminski <marcin@python-works.com> parents: 2287 diff changeset	1636
2217 76947224bf27 Implemented initial code-review status of changesets Marcin Kuzminski <marcin@python-works.com> parents: 2215 diff changeset	1637 @property
76947224bf27 Implemented initial code-review status of changesets Marcin Kuzminski <marcin@python-works.com> parents: 2215 diff changeset	1638 def status_lbl(self):
2296 e5c0f201ca0b Add changeset status change into emails Marcin Kuzminski <marcin@python-works.com> parents: 2287 diff changeset	1639 return ChangesetStatus.get_status_lbl(self.status)
2217 76947224bf27 Implemented initial code-review status of changesets Marcin Kuzminski <marcin@python-works.com> parents: 2215 diff changeset	1640
2215 2c2bdaeca912 code-review initial Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1641
2434 f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1642 class PullRequest(Base, BaseModel):
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1643 __tablename__ = 'pull_requests'
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1644 __table_args__ = (
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1645 {'extend_existing': True, 'mysql_engine': 'InnoDB',
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1646 'mysql_charset': 'utf8'},
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1647 )
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1648
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1649 STATUS_NEW = u'new'
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1650 STATUS_OPEN = u'open'
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1651 STATUS_CLOSED = u'closed'
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1652
2434 f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1653 pull_request_id = Column('pull_request_id', Integer(), nullable=False, primary_key=True)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1654 title = Column('title', Unicode(256), nullable=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1655 description = Column('description', UnicodeText(10240), nullable=True)
32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1656 status = Column('status', Unicode(256), nullable=False, default=STATUS_NEW)
2440 1bc579bcd67a - pull request generates overview based on it's params Marcin Kuzminski <marcin@python-works.com> parents: 2434 diff changeset	1657 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
2608 58c529332e7e Added option to close pull requests, in future that will be close & merge Marcin Kuzminski <marcin@python-works.com> parents: 2603 diff changeset	1658 updated_on = Column('updated_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
2440 1bc579bcd67a - pull request generates overview based on it's params Marcin Kuzminski <marcin@python-works.com> parents: 2434 diff changeset	1659 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None)
2434 f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1660 _revisions = Column('revisions', UnicodeText(20500)) # 500 revisions max
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1661 org_repo_id = Column('org_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1662 org_ref = Column('org_ref', Unicode(256), nullable=False)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1663 other_repo_id = Column('other_repo_id', Integer(), ForeignKey('repositories.repo_id'), nullable=False)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1664 other_ref = Column('other_ref', Unicode(256), nullable=False)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1665
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1666 @hybrid_property
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1667 def revisions(self):
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1668 return self._revisions.split(':')
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1669
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1670 @revisions.setter
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1671 def revisions(self, val):
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1672 self._revisions = ':'.join(val)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1673
2440 1bc579bcd67a - pull request generates overview based on it's params Marcin Kuzminski <marcin@python-works.com> parents: 2434 diff changeset	1674 author = relationship('User', lazy='joined')
2674 a221706dab50 merged + fixed pull request #62: Implemented metatags and visualisation options. Marcin Kuzminski <marcin@python-works.com> parents: 2668 diff changeset	1675 reviewers = relationship('PullRequestReviewers',
2666 c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	1676 cascade="all, delete, delete-orphan")
2434 f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1677 org_repo = relationship('Repository', primaryjoin='PullRequest.org_repo_id==Repository.repo_id')
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1678 other_repo = relationship('Repository', primaryjoin='PullRequest.other_repo_id==Repository.repo_id')
2666 c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	1679 statuses = relationship('ChangesetStatus')
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	1680 comments = relationship('ChangesetComment',
c51fb1da6df2 cascade fixes for comments/pull-requests/reviewers Marcin Kuzminski <marcin@python-works.com> parents: 2665 diff changeset	1681 cascade="all, delete, delete-orphan")
2434 f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1682
2608 58c529332e7e Added option to close pull requests, in future that will be close & merge Marcin Kuzminski <marcin@python-works.com> parents: 2603 diff changeset	1683 def is_closed(self):
58c529332e7e Added option to close pull requests, in future that will be close & merge Marcin Kuzminski <marcin@python-works.com> parents: 2603 diff changeset	1684 return self.status == self.STATUS_CLOSED
58c529332e7e Added option to close pull requests, in future that will be close & merge Marcin Kuzminski <marcin@python-works.com> parents: 2603 diff changeset	1685
2434 f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1686 def __json__(self):
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1687 return dict(
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1688 revisions=self.revisions
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1689 )
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1690
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1691
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1692 class PullRequestReviewers(Base, BaseModel):
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1693 __tablename__ = 'pull_request_reviewers'
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1694 __table_args__ = (
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1695 {'extend_existing': True, 'mysql_engine': 'InnoDB',
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1696 'mysql_charset': 'utf8'},
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1697 )
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1698
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1699 def __init__(self, user=None, pull_request=None):
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1700 self.user = user
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1701 self.pull_request = pull_request
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1702
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1703 pull_requests_reviewers_id = Column('pull_requests_reviewers_id', Integer(), nullable=False, primary_key=True)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1704 pull_request_id = Column("pull_request_id", Integer(), ForeignKey('pull_requests.pull_request_id'), nullable=False)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1705 user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=True)
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1706
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1707 user = relationship('User')
f29469677319 Added basic models for saving open pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2430 diff changeset	1708 pull_request = relationship('PullRequest')
1886 50e32940e464 code garden Marcin Kuzminski <marcin@python-works.com> parents: 1884 diff changeset	1709
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1710
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1711 class Notification(Base, BaseModel):
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1712 __tablename__ = 'notifications'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1713 __table_args__ = (
2463 b426ecc30319 Added some DB indexes to optimize queries Marcin Kuzminski <marcin@python-works.com> parents: 2462 diff changeset	1714 Index('notification_type_idx', 'type'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1715 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1716 'mysql_charset': 'utf8'},
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1717 )
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1718
1712 cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1719 TYPE_CHANGESET_COMMENT = u'cs_comment'
cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1720 TYPE_MESSAGE = u'message'
cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1721 TYPE_MENTION = u'mention'
1731 31e6eb2fb4b2 implements #222 registration feedback Marcin Kuzminski <marcin@python-works.com> parents: 1729 diff changeset	1722 TYPE_REGISTRATION = u'registration'
2244 77e376fdc4c6 pull requests draft UI Marcin Kuzminski <marcin@python-works.com> parents: 2218 diff changeset	1723 TYPE_PULL_REQUEST = u'pull_request'
2443 fd0a822481ec - added commenting to pull requests Marcin Kuzminski <marcin@python-works.com> parents: 2440 diff changeset	1724 TYPE_PULL_REQUEST_COMMENT = u'pull_request_comment'
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1725
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1726 notification_id = Column('notification_id', Integer(), nullable=False, primary_key=True)
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1727 subject = Column('subject', Unicode(512), nullable=True)
2588 32dd6896abcf added status column to pull request + some small refactoring of models Marcin Kuzminski <marcin@python-works.com> parents: 2585 diff changeset	1728 body = Column('body', UnicodeText(50000), nullable=True)
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1729 created_by = Column("created_by", Integer(), ForeignKey('users.user_id'), nullable=True)
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1730 created_on = Column('created_on', DateTime(timezone=False), nullable=False, default=datetime.datetime.now)
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1731 type_ = Column('type', Unicode(256))
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1732
1712 cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1733 created_by_user = relationship('User')
1717 7ff304d3028f Notification fixes Marcin Kuzminski <marcin@python-works.com> parents: 1716 diff changeset	1734 notifications_to_users = relationship('UserNotification', lazy='joined',
7ff304d3028f Notification fixes Marcin Kuzminski <marcin@python-works.com> parents: 1716 diff changeset	1735 cascade="all, delete, delete-orphan")
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1736
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1737 @property
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1738 def recipients(self):
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1739 return [x.user for x in UserNotification.query()\
2248 72542dc597be fixed issue with empty APIKEYS on registration #438 Marcin Kuzminski <marcin@python-works.com> parents: 2161 diff changeset	1740 .filter(UserNotification.notification == self)\
2585 a52cee88d612 fixed sorting in recipients query of notifications Marcin Kuzminski <marcin@python-works.com> parents: 2562 diff changeset	1741 .order_by(UserNotification.user_id.asc()).all()]
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1742
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1743 @classmethod
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1744 def create(cls, created_by, subject, body, recipients, type_=None):
f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1745 if type_ is None:
f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1746 type_ = Notification.TYPE_MESSAGE
f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1747
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1748 notification = cls()
1712 cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1749 notification.created_by_user = created_by
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1750 notification.subject = subject
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1751 notification.body = body
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1752 notification.type_ = type_
1717 7ff304d3028f Notification fixes Marcin Kuzminski <marcin@python-works.com> parents: 1716 diff changeset	1753 notification.created_on = datetime.datetime.now()
1713 54687aa00724 Tests updates, Session refactoring Marcin Kuzminski <marcin@python-works.com> parents: 1712 diff changeset	1754
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1755 for u in recipients:
1713 54687aa00724 Tests updates, Session refactoring Marcin Kuzminski <marcin@python-works.com> parents: 1712 diff changeset	1756 assoc = UserNotification()
54687aa00724 Tests updates, Session refactoring Marcin Kuzminski <marcin@python-works.com> parents: 1712 diff changeset	1757 assoc.notification = notification
54687aa00724 Tests updates, Session refactoring Marcin Kuzminski <marcin@python-works.com> parents: 1712 diff changeset	1758 u.notifications.append(assoc)
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1759 Session().add(notification)
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1760 return notification
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1761
1712 cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1762 @property
cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1763 def description(self):
cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1764 from rhodecode.model.notification import NotificationModel
cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1765 return NotificationModel().make_description(self)
cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1766
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	1767
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1768 class UserNotification(Base, BaseModel):
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1769 __tablename__ = 'user_to_notification'
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1770 __table_args__ = (
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1771 UniqueConstraint('user_id', 'notification_id'),
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1772 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1773 'mysql_charset': 'utf8'}
1958 7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1774 )
7e4b3d3a9c5c renamed repo groups table Marcin Kuzminski <marcin@python-works.com> parents: 1950 diff changeset	1775 user_id = Column('user_id', Integer(), ForeignKey('users.user_id'), primary_key=True)
1713 54687aa00724 Tests updates, Session refactoring Marcin Kuzminski <marcin@python-works.com> parents: 1712 diff changeset	1776 notification_id = Column("notification_id", Integer(), ForeignKey('notifications.notification_id'), primary_key=True)
1703 f23828b00b21 notification fixes and improvements Marcin Kuzminski <marcin@python-works.com> parents: 1702 diff changeset	1777 read = Column('read', Boolean, default=False)
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1778 sent_on = Column('sent_on', DateTime(timezone=False), nullable=True, unique=None)
8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1779
1713 54687aa00724 Tests updates, Session refactoring Marcin Kuzminski <marcin@python-works.com> parents: 1712 diff changeset	1780 user = relationship('User', lazy="joined")
1717 7ff304d3028f Notification fixes Marcin Kuzminski <marcin@python-works.com> parents: 1716 diff changeset	1781 notification = relationship('Notification', lazy="joined",
1960 3daa7093fbbb fix typo in db models Marcin Kuzminski <marcin@python-works.com> parents: 1958 diff changeset	1782 order_by=lambda: Notification.created_on.desc(),)
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1783
1712 cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1784 def mark_as_read(self):
cac5109ac3b6 Notification system improvements Marcin Kuzminski <marcin@python-works.com> parents: 1703 diff changeset	1785 self.read = True
2520 a1e156503afe Fixed calls to Session in db model Marcin Kuzminski <marcin@python-works.com> parents: 2510 diff changeset	1786 Session().add(self)
1702 8cb7f5c4d494 #302 - basic notification system, models+tests Marcin Kuzminski <marcin@python-works.com> parents: 1693 diff changeset	1787
1800 6c86c987cf93 pep8ify Marcin Kuzminski <marcin@python-works.com> parents: 1758 diff changeset	1788
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1789 class DbMigrateVersion(Base, BaseModel):
834 8924ed0e4f36 added current db version into rhodecode, Marcin Kuzminski <marcin@python-works.com> parents: 832 diff changeset	1790 __tablename__ = 'db_migrate_version'
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1791 __table_args__ = (
2356 2da7b5984ae5 typo fix + code garden Marcin Kuzminski <marcin@python-works.com> parents: 2352 diff changeset	1792 {'extend_existing': True, 'mysql_engine': 'InnoDB',
2149 50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1793 'mysql_charset': 'utf8'},
50aa7cb78cfe Mysql fixes Marcin Kuzminski <marcin@python-works.com> parents: 2147 diff changeset	1794 )
1594 9dae92a65e40 fixes #288 Marcin Kuzminski <marcin@python-works.com> parents: 1593 diff changeset	1795 repository_id = Column('repository_id', String(250), primary_key=True)
1593 92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1796 repository_path = Column('repository_path', Text)
92a4f7c496a5 Correct code style Nicolas VINOT <aeris@imirhil.fr> parents: 1592 diff changeset	1797 version = Column('version', Integer)

Mercurial > kallithea

annotate rhodecode/model/db.py @ 2995:32471bd1f4ee beta