# HG changeset patch # User Marcin Kuzminski # Date 2012-01-28 05:14:34 # Node ID 9bbde54232dc7ccf3188f502f80513bbbc0750e1 # Parent f48bce87475b34a2a7bb90cbe5523b9102bf9806 white space cleanup diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- 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, BaseMode 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 --- 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 --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -30,7 +30,7 @@
r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
-
+
${c.changeset.date}