Changeset - 92a4f7c496a5
[Not reviewed]
beta
0 6 0
Nicolas VINOT - 14 years ago 2011-10-23 01:16:55
aeris@imirhil.fr
Correct code style
2 files changed with 9 insertions and 9 deletions:
0 comments (0 inline, 0 general)
rhodecode/controllers/api/api.py
Show inline comments
 
@@ -364,7 +364,7 @@ class ApiController( JSONRPCController )
 
            except NoResultFound:
 
                raise JSONRPCError( 'unknown user %s' % user )
 

	
 
            RepositoryPermissionModel().updateOrDeleteUserPermission( repo, user, perm )
 
            RepositoryPermissionModel().update_or_delete_user_permission(repo, user, perm)
 
        except Exception:
 
            log.error( traceback.format_exc() )
 
            raise JSONRPCError( 'failed to edit permission %(repo)s for %(user)s'
rhodecode/model/repo_permission.py
Show inline comments
 
@@ -30,15 +30,15 @@ from rhodecode.model.meta import Session
 
log = logging.getLogger( __name__ )
 

	
 
class RepositoryPermissionModel( BaseModel ):
 
    def getUserPermission( self, repository, user ):
 
    def get_user_permission(self, repository, user):
 
        return RepoToPerm.query() \
 
                .filter( RepoToPerm.user == user ) \
 
                .filter( RepoToPerm.repository == repository ) \
 
                .scalar()
 

	
 
    def updateUserPermission( self, repository, user, permission ):
 
    def update_user_permission(self, repository, user, permission):
 
        permission = Permission.get_by_key( permission )
 
        current = self.getUserPermission( repository, user )
 
        current = self.get_user_permission(repository, user)
 
        if current:
 
            if not current.permission is permission:
 
                current.permission = permission
 
@@ -50,14 +50,14 @@ class RepositoryPermissionModel( BaseMod
 
            Session.add( p )
 
        Session.commit()
 

	
 
    def deleteUserPermission( self, repository, user ):
 
        current = self.getUserPermission( repository, user )
 
    def delete_user_permission(self, repository, user):
 
        current = self.get_user_permission(repository, user)
 
        if current:
 
            Session.delete( current )
 
            Session.commit()
 

	
 
    def updateOrDeleteUserPermission( self, repository, user, permission ):
 
    def update_or_delete_user_permission(self, repository, user, permission):
 
        if permission:
 
            self.updateUserPermission( repository, user, permission )
 
            self.update_user_permission(repository, user, permission)
 
        else:
 
            self.deleteUserPermission( repository, user )
 
            self.delete_user_permission(repository, user)
0 comments (0 inline, 0 general)