aboutsummaryrefslogtreecommitdiff
path: root/rhodecode
diff options
context:
space:
mode:
authorMarcin Kuzminski <marcin@python-works.com>2012-01-28 07:14:34 +0200
committerMarcin Kuzminski <marcin@python-works.com>2012-01-28 07:14:34 +0200
commitd37c2a9dab8bd7110fa6414bfca80a7f08f73c7f (patch)
treee7204e4d928ef5eb42591d897dcae8ebda302b49 /rhodecode
parent6bd0e47161420b31d4342258e5fd433feab70361 (diff)
white space cleanup
--HG-- branch : beta
Diffstat (limited to 'rhodecode')
-rwxr-xr-xrhodecode/model/db.py14
-rw-r--r--rhodecode/model/forms.py8
-rw-r--r--rhodecode/templates/changeset/changeset.html2
3 files changed, 12 insertions, 12 deletions
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
index 4b3b3299..b3808d09 100755
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -220,7 +220,7 @@ class RhodeCodeSetting(Base, BaseModel):
class RhodeCodeUi(Base, BaseModel):
__tablename__ = 'rhodecode_ui'
__table_args__ = (
- UniqueConstraint('ui_key'),
+ UniqueConstraint('ui_key'),
{'extend_existing': True}
)
@@ -270,7 +270,7 @@ class RhodeCodeUi(Base, BaseModel):
class User(Base, BaseModel):
__tablename__ = 'users'
__table_args__ = (
- UniqueConstraint('username'), UniqueConstraint('email'),
+ UniqueConstraint('username'), UniqueConstraint('email'),
{'extend_existing': True}
)
user_id = Column("user_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -459,7 +459,7 @@ class UsersGroupMember(Base, BaseModel):
class Repository(Base, BaseModel):
__tablename__ = 'repositories'
__table_args__ = (
- UniqueConstraint('repo_name'),
+ UniqueConstraint('repo_name'),
{'extend_existing': True},
)
@@ -707,7 +707,7 @@ class RepoGroup(Base, BaseModel):
__tablename__ = 'groups'
__table_args__ = (
UniqueConstraint('group_name', 'group_parent_id'),
- CheckConstraint('group_id != group_parent_id'),
+ CheckConstraint('group_id != group_parent_id'),
{'extend_existing': True},
)
__mapper_args__ = {'order_by': 'group_name'}
@@ -891,7 +891,7 @@ class UserToPerm(Base, BaseModel):
class UsersGroupRepoToPerm(Base, BaseModel):
__tablename__ = 'users_group_repo_to_perm'
__table_args__ = (
- UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
+ UniqueConstraint('repository_id', 'users_group_id', 'permission_id'),
{'extend_existing': True}
)
users_group_to_perm_id = Column("users_group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
@@ -929,7 +929,7 @@ class UsersGroupToPerm(Base, BaseModel):
class UserRepoGroupToPerm(Base, BaseModel):
__tablename__ = 'user_repo_group_to_perm'
__table_args__ = (
- UniqueConstraint('group_id', 'permission_id'),
+ UniqueConstraint('group_id', 'permission_id'),
{'extend_existing': True}
)
@@ -946,7 +946,7 @@ class UserRepoGroupToPerm(Base, BaseModel):
class UsersGroupRepoGroupToPerm(Base, BaseModel):
__tablename__ = 'users_group_repo_group_to_perm'
__table_args__ = (
- UniqueConstraint('group_id', 'permission_id'),
+ UniqueConstraint('group_id', 'permission_id'),
{'extend_existing': True}
)
diff --git a/rhodecode/model/forms.py b/rhodecode/model/forms.py
index 52f57afa..17be634e 100644
--- a/rhodecode/model/forms.py
+++ b/rhodecode/model/forms.py
@@ -84,8 +84,8 @@ def ValidUsername(edit, old_data):
raise formencode.Invalid(
_('Username may only contain alphanumeric characters '
'underscores, periods or dashes and must begin with '
- 'alphanumeric character'),
- value,
+ 'alphanumeric character'),
+ value,
state
)
@@ -116,8 +116,8 @@ def ValidUsersGroup(edit, old_data):
raise formencode.Invalid(
_('RepoGroup name may only contain alphanumeric characters '
'underscores, periods or dashes and must begin with '
- 'alphanumeric character'),
- value,
+ 'alphanumeric character'),
+ value,
state
)
diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html
index 551f4e38..35676eb4 100644
--- a/rhodecode/templates/changeset/changeset.html
+++ b/rhodecode/templates/changeset/changeset.html
@@ -30,7 +30,7 @@
<div class="hash">
r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
</div>
- <div class="date">
+ <div class="date">
${c.changeset.date}
</div>
<div class="diff-actions">