aboutsummaryrefslogtreecommitdiff
path: root/rhodecode/model
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2012-03-21 19:19:22 +0200
committerMarcin Kuzminski <marcin@python-works.com>2012-03-21 19:19:22 +0200
commitf400e9c8796657303b5807feb2a05aa790fe4fa8 (patch)
tree85637c32f8b7e5a2a238171770829a979b5e07f7 /rhodecode/model
parentc3e8762fa75ce377489b29cda6f23acdce6a3449 (diff)
White space cleanup
--HG-- branch : beta
Diffstat (limited to 'rhodecode/model')
-rw-r--r--rhodecode/model/comment.py2
-rwxr-xr-xrhodecode/model/db.py10
-rw-r--r--rhodecode/model/user.py2
3 files changed, 7 insertions, 7 deletions
diff --git a/rhodecode/model/comment.py b/rhodecode/model/comment.py
index 51d6bf1e..fb132b7a 100644
--- a/rhodecode/model/comment.py
+++ b/rhodecode/model/comment.py
@@ -63,6 +63,7 @@ class ChangesetCommentsModel(BaseModel):
:param f_path:
:param line_no:
"""
+
if text:
repo = Repository.get(repo_id)
cs = repo.scm_instance.get_changeset(revision)
@@ -78,7 +79,6 @@ class ChangesetCommentsModel(BaseModel):
self.sa.add(comment)
self.sa.flush()
-
# make notification
line = ''
if line_no:
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 569b6dc5..b9ceeddb 100755
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -299,7 +299,7 @@ class User(Base, BaseModel):
user_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_user_id==User.user_id', cascade='all')
repo_to_perm = relationship('UserRepoToPerm', primaryjoin='UserRepoToPerm.user_id==User.user_id', cascade='all')
repo_group_to_perm = relationship('UserRepoGroupToPerm', primaryjoin='UserRepoGroupToPerm.user_id==User.user_id', cascade='all')
-
+
group_member = relationship('UsersGroupMember', cascade='all')
notifications = relationship('UserNotification',)
@@ -967,7 +967,7 @@ class UsersGroupToPerm(Base, BaseModel):
__tablename__ = 'users_group_to_perm'
__table_args__ = (
UniqueConstraint('users_group_id', 'permission_id',),
- {'extend_existing': True, 'mysql_engine':'InnoDB',
+ {'extend_existing': True, 'mysql_engine':'InnoDB',
'mysql_charset': 'utf8'}
)
users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -982,7 +982,7 @@ class UserRepoGroupToPerm(Base, BaseModel):
__tablename__ = 'user_repo_group_to_perm'
__table_args__ = (
UniqueConstraint('user_id', 'group_id', 'permission_id'),
- {'extend_existing': True, 'mysql_engine':'InnoDB',
+ {'extend_existing': True, 'mysql_engine':'InnoDB',
'mysql_charset': 'utf8'}
)
@@ -1017,8 +1017,8 @@ class UsersGroupRepoGroupToPerm(Base, BaseModel):
class Statistics(Base, BaseModel):
__tablename__ = 'statistics'
__table_args__ = (
- UniqueConstraint('repository_id'),
- {'extend_existing': True, 'mysql_engine':'InnoDB',
+ UniqueConstraint('repository_id'),
+ {'extend_existing': True, 'mysql_engine':'InnoDB',
'mysql_charset': 'utf8'}
)
stat_id = Column("stat_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
diff --git a/rhodecode/model/user.py b/rhodecode/model/user.py
index 4e0c3b81..a250b169 100644
--- a/rhodecode/model/user.py
+++ b/rhodecode/model/user.py
@@ -526,7 +526,7 @@ class UserModel(BaseModel):
.join((UsersGroupMember, UsersGroupRepoGroupToPerm.users_group_id == UsersGroupMember.users_group_id))\
.filter(UsersGroupMember.user_id == uid)\
.all()
-
+
for perm in user_repo_group_perms_from_users_groups:
g_k = perm.UsersGroupRepoGroupToPerm.group.group_name
print perm, g_k