kallithea Changeset - a8c9c0094ddf

Changeset - a8c9c0094ddf

Parent rev.

Child rev.

[Not reviewed]

beta

0 7 0

Marcin Kuzminski - 14 years ago 2012-03-21 18:19:22
marcin@python-works.com

White space cleanup

7 files changed with 12 insertions and 12 deletions:

rhodecode/model/comment.py

rhodecode/model/db.py

rhodecode/model/user.py

rhodecode/templates/admin/repos/repo_edit_perms.html

rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html

rhodecode/templates/index_base.html

rhodecode/tests/functional/test_changeset_comments.py

0 comments (0 inline, 0 general)

rhodecode/model/comment.py

➞

Show inline comments

@@ @@ -60,12 +60,13 @@ class ChangesetCommentsModel(BaseModel): @@
         :param repo_id:
         :param user_id:
         :param revision:
         :param f_path:
         :param line_no:
         """
         if text:
             repo = Repository.get(repo_id)
             cs = repo.scm_instance.get_changeset(revision)
             desc = cs.message
             author_email = cs.author_email
             comment = ChangesetComment()
@@ @@ -75,13 +76,12 @@ class ChangesetCommentsModel(BaseModel): @@
             comment.text = text
             comment.f_path = f_path
             comment.line_no = line_no
             self.sa.add(comment)
             self.sa.flush()
             # make notification
             line = ''
             if line_no:
                 line = _('on line %s') % line_no
             subj = h.link_to('Re commit: %(commit_desc)s %(line)s' % \
                                     {'commit_desc': desc, 'line': line},

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -296,13 +296,13 @@ class User(Base, BaseModel): @@
     user_perms = relationship('UserToPerm', primaryjoin="User.user_id==UserToPerm.user_id", cascade='all')
     repositories = relationship('Repository')
     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',)
     @hybrid_property
     def email(self):
@@ @@ -964,13 +964,13 @@ class UsersGroupRepoToPerm(Base, BaseMod @@
 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)
     users_group_id = Column("users_group_id", Integer(), ForeignKey('users_groups.users_group_id'), nullable=False, unique=None, default=None)
     permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)
@@ @@ -979,13 +979,13 @@ class UsersGroupToPerm(Base, BaseModel): @@
 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'}
+    )
     group_to_perm_id = Column("group_to_perm_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=None, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)
@@ @@ -1014,14 +1014,14 @@ class UsersGroupRepoGroupToPerm(Base, Ba @@
     group = relationship('RepoGroup')
 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)
     repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=True, default=None)
     stat_on_revision = Column("stat_on_revision", Integer(), nullable=False)
     commit_activity = Column("commit_activity", LargeBinary(1000000), nullable=False)#JSON data

rhodecode/model/user.py

➞

Show inline comments

@@ @@ -523,13 +523,13 @@ class UserModel(BaseModel): @@
              self.sa.query(UsersGroupRepoGroupToPerm, Permission, RepoGroup)\
              .join((RepoGroup, UsersGroupRepoGroupToPerm.group_id == RepoGroup.group_id))\
              .join((Permission, UsersGroupRepoGroupToPerm.permission_id == Permission.permission_id))\
              .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
                 p = perm.Permission.permission_name
                 cur_perm = user.permissions[GK][g_k]
                 # overwrite permission only if it's greater than permission

rhodecode/templates/admin/repos/repo_edit_perms.html

➞

Show inline comments

@@ @@ -119,10 +119,10 @@ YUE.onDOMReady(function () { @@
     });
     MembersAutoComplete(
     		  ${c.users_array|n},
     		  ${c.users_groups_array|n},
     		  "${_('Group')}",
     		  "${_('members')}"
-    		);
     		);
 });
 </script>

rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html

➞

Show inline comments

@@ @@ -108,10 +108,10 @@ YUE.onDOMReady(function () { @@
     });
     MembersAutoComplete(
             ${c.users_array|n},
             ${c.users_groups_array|n},
             "${_('Group')}",
             "${_('members')}"
-          );
           );
 });
 </script>

rhodecode/templates/index_base.html

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ @@
                 <ul class="links">
                   <li>
                   %if c.group:
                     <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository',parent_group=c.group.group_id))}</span>
                   %else:
                     <span>${h.link_to(_('ADD REPOSITORY'),h.url('admin_settings_create_repository'))}</span>
-                  %endif
                   %endif
                   </li>
                 </ul>
                 %endif
             %endif
         </div>
         <!-- end box / title -->

rhodecode/tests/functional/test_changeset_comments.py

➞

Show inline comments

@@ @@ -46,13 +46,13 @@ class TestChangeSetCommentsController(Te @@
         self.assertEqual(Notification.query().count(), 1)
         self.assertEqual(ChangesetComment.query().count(), 1)
         notification = Notification.query().all()[0]
         ID = ChangesetComment.query().first().comment_id
-        self.assertEqual(notification.type_,
         self.assertEqual(notification.type_,
                          Notification.TYPE_CHANGESET_COMMENT)
         sbj = (u'/vcs_test_hg/changeset/'
                '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)
         print "%s vs %s" % (sbj, notification.subject)
         self.assertTrue(sbj in notification.subject)
@@ @@ -83,13 +83,13 @@ class TestChangeSetCommentsController(Te @@
         self.assertEqual(Notification.query().count(), 1)
         self.assertEqual(ChangesetComment.query().count(), 1)
         notification = Notification.query().all()[0]
         ID = ChangesetComment.query().first().comment_id
-        self.assertEqual(notification.type_,
         self.assertEqual(notification.type_,
                          Notification.TYPE_CHANGESET_COMMENT)
         sbj = (u'/vcs_test_hg/changeset/'
                '27cd5cce30c96924232dffcd24178a07ffeb5dfc#comment-%s' % ID)
         print "%s vs %s" % (sbj, notification.subject)
         self.assertTrue(sbj in notification.subject)

0 comments (0 inline, 0 general)