Changeset - 9bbde54232dc
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 14 years ago 2012-01-28 06:14:34
marcin@python-works.com
white space cleanup
3 files changed with 12 insertions and 12 deletions:
rhodecode/model/db.py
7
7
rhodecode/model/forms.py
4
4
rhodecode/templates/changeset/changeset.html
1
1
0 comments (0 inline, 0 general)
rhodecode/model/db.py
➞
Show inline comments
 
@@ -211,25 +211,25 @@ class RhodeCodeSetting(Base, BaseModel):
 
        ret = cls.query()\
 
                .filter(cls.app_settings_name.startswith('ldap_')).all()
 
        fd = {}
 
        for row in ret:
 
            fd.update({row.app_settings_name:row.app_settings_value})
 

			




	
	
	
		
 
        return fd

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class RhodeCodeUi(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'rhodecode_ui'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('ui_key'), 

			




	
	
	
		
 
        UniqueConstraint('ui_key'),

			




	
	
	
		
 
        {'extend_existing': True}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    HOOK_UPDATE = 'changegroup.update'

			




	
	
	
		
 
    HOOK_REPO_SIZE = 'changegroup.repo_size'

			




	
	
	
		
 
    HOOK_PUSH = 'pretxnchangegroup.push_logger'

			




	
	
	
		
 
    HOOK_PULL = 'preoutgoing.pull_logger'

			




	
	
	
		
 

			




	
	
	
		
 
    ui_id = Column("ui_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    ui_section = Column("ui_section", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    ui_key = Column("ui_key", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    ui_value = Column("ui_value", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
		
 
@@ -261,25 +261,25 @@ class RhodeCodeUi(Base, BaseModel):

			




	
	
	
		
 
        new_ui = cls.get_by_key(key).scalar() or cls()

			




	
	
	
		
 
        new_ui.ui_section = 'hooks'

			




	
	
	
		
 
        new_ui.ui_active = True

			




	
	
	
		
 
        new_ui.ui_key = key

			




	
	
	
		
 
        new_ui.ui_value = val

			




	
	
	
		
 

			




	
	
	
		
 
        Session.add(new_ui)

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
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)

			




	
	
	
		
 
    username = Column("username", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    password = Column("password", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    active = Column("active", Boolean(), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    admin = Column("admin", Boolean(), nullable=True, unique=None, default=False)

			




	
	
	
		
 
    name = Column("name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    lastname = Column("lastname", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    _email = Column("email", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    last_login = Column("last_login", DateTime(timezone=False), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    ldap_dn = Column("ldap_dn", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
		
 
@@ -450,25 +450,25 @@ class UsersGroupMember(Base, BaseModel):

			




	
	
	
		
 
    def add_user_to_group(group, user):

			




	
	
	
		
 
        ugm = UsersGroupMember()

			




	
	
	
		
 
        ugm.users_group = group

			




	
	
	
		
 
        ugm.user = user

			




	
	
	
		
 
        Session.add(ugm)

			




	
	
	
		
 
        Session.commit()

			




	
	
	
		
 
        return ugm

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
class Repository(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'repositories'

			




	
	
	
		
 
    __table_args__ = (

			




	
	
	
		
 
        UniqueConstraint('repo_name'), 

			




	
	
	
		
 
        UniqueConstraint('repo_name'),

			




	
	
	
		
 
        {'extend_existing': True},

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    repo_id = Column("repo_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    repo_name = Column("repo_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    clone_uri = Column("clone_uri", String(length=255, convert_unicode=False, assert_unicode=None), nullable=True, unique=False, default=None)

			




	
	
	
		
 
    repo_type = Column("repo_type", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default='hg')

			




	
	
	
		
 
    user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)

			




	
	
	
		
 
    private = Column("private", Boolean(), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True)

			




	
	
	
		
 
    enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True)

			




	
	
	
		
 
    description = Column("description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
		
 
@@ -698,25 +698,25 @@ class Repository(Base, BaseModel):

			




	
	
	
		
 
            if repo._get_hidden():

			




	
	
	
		
 
                return

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            repo = backend(repo_full_path, create=False)

			




	
	
	
		
 

			




	
	
	
		
 
        return repo

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
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'}

			




	
	
	
		
 

			




	
	
	
		
 
    group_id = Column("group_id", Integer(), nullable=False, unique=True, default=None, primary_key=True)

			




	
	
	
		
 
    group_name = Column("group_name", String(length=255, convert_unicode=False, assert_unicode=None), nullable=False, unique=True, default=None)

			




	
	
	
		
 
    group_parent_id = Column("group_parent_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=None, default=None)

			




	
	
	
		
 
    group_description = Column("group_description", String(length=10000, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    parent_group = relationship('RepoGroup', remote_side=group_id)

			




	
	
	
		
 

			




	
	
	
		
 
    def __init__(self, group_name='', parent_group=None):

			




	
	
		
 
@@ -882,25 +882,25 @@ class UserToPerm(Base, BaseModel):

			




	
	
	
		
 
    __table_args__ = (UniqueConstraint('user_id', 'permission_id'), {'extend_existing': True})

			




	
	
	
		
 
    user_to_perm_id = Column("user_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)

			




	
	
	
		
 
    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 
    permission = relationship('Permission', lazy='joined')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
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)

			




	
	
	
		
 
    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)

			




	
	
	
		
 
    repository_id = Column("repository_id", Integer(), ForeignKey('repositories.repo_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    users_group = relationship('UsersGroup')

			




	
	
	
		
 
    permission = relationship('Permission')

			




	
	
	
		
 
    repository = relationship('Repository')

			




	
	
	
		
 

			




	
	
	
		
 
    @classmethod

			




	
	
		
 
@@ -920,42 +920,42 @@ class UsersGroupToPerm(Base, BaseModel):

			




	
	
	
		
 
    __tablename__ = 'users_group_to_perm'

			




	
	
	
		
 
    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)

			




	
	
	
		
 

			




	
	
	
		
 
    users_group = relationship('UsersGroup')

			




	
	
	
		
 
    permission = relationship('Permission')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
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}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    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)

			




	
	
	
		
 
    permission_id = Column("permission_id", Integer(), ForeignKey('permissions.permission_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    user = relationship('User')

			




	
	
	
		
 
    permission = relationship('Permission')

			




	
	
	
		
 
    group = relationship('RepoGroup')

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
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}

			




	
	
	
		
 
    )

			




	
	
	
		
 

			




	
	
	
		
 
    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)

			




	
	
	
		
 
    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)

			




	
	
	
		
 
    group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=False, unique=None, default=None)

			




	
	
	
		
 

			




	
	
	
		
 
    users_group = relationship('UsersGroup')

			




	
	
	
		
 
    permission = relationship('Permission')

			




	
	
	
		
 
    group = relationship('RepoGroup')

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/model/forms.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -75,26 +75,26 @@ def ValidUsername(edit, old_data):

			




	
	
	
		
 
            if edit:

			




	
	
	
		
 
                old_un = User.get(old_data.get('user_id')).username

			




	
	
	
		
 

			




	
	
	
		
 
            if old_un != value or not edit:

			




	
	
	
		
 
                if User.get_by_username(value, case_insensitive=True):

			




	
	
	
		
 
                    raise formencode.Invalid(_('This username already '

			




	
	
	
		
 
                                               'exists') , value, state)

			




	
	
	
		
 

			




	
	
	
		
 
            if re.match(r'^[a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+$', value) is None:

			




	
	
	
		
 
                raise formencode.Invalid(

			




	
	
	
		
 
                    _('Username may only contain alphanumeric characters '

			




	
	
	
		
 
                      'underscores, periods or dashes and must begin with '

			




	
	
	
		
 
                      'alphanumeric character'), 

			




	
	
	
		
 
                    value, 

			




	
	
	
		
 
                      'alphanumeric character'),

			




	
	
	
		
 
                    value,

			




	
	
	
		
 
                    state

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
    return _ValidUsername

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def ValidUsersGroup(edit, old_data):

			




	
	
	
		
 

			




	
	
	
		
 
    class _ValidUsersGroup(formencode.validators.FancyValidator):

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            if value in ['default']:

			




	
	
		
 
@@ -107,26 +107,26 @@ def ValidUsersGroup(edit, old_data):

			




	
	
	
		
 

			




	
	
	
		
 
            if old_ugname != value or not edit:

			




	
	
	
		
 
                if UsersGroup.get_by_group_name(value, cache=False,

			




	
	
	
		
 
                                               case_insensitive=True):

			




	
	
	
		
 
                    raise formencode.Invalid(_('This users group '

			




	
	
	
		
 
                                               'already exists'), value,

			




	
	
	
		
 
                                             state)

			




	
	
	
		
 

			




	
	
	
		
 
            if re.match(r'^[a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+$', value) is None:

			




	
	
	
		
 
                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

			




	
	
	
		
 
                )

			




	
	
	
		
 

			




	
	
	
		
 
    return _ValidUsersGroup

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
def ValidReposGroup(edit, old_data):

			




	
	
	
		
 
    class _ValidReposGroup(formencode.validators.FancyValidator):

			




	
	
	
		
 

			




	
	
	
		
 
        def validate_python(self, value, state):

			




	
	
	
		
 
            # TODO WRITE VALIDATIONS

			




	
	
	
		
 
            group_name = value.get('group_name')

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -21,25 +21,25 @@

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
		<div class="diffblock">

			




	
	
	
		
 
			<div class="code-header">

			




	
	
	
		
 
                <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">

			




	
	
	
		
 
                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>

			




	
	
	
		
 
                  ${c.ignorews_url()}

			




	
	
	
		
 
                  ${c.context_url()}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
	    <div id="changeset_content">

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.