kallithea Changeset - 307ec693bdf2

Changeset - 307ec693bdf2

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Nicolas VINOT - 14 years ago 2011-10-07 21:49:28
aeris@imirhil.fr

[API] Create groups needed when creating repo

5 files changed with 52 insertions and 28 deletions:

.hgignore

rhodecode/controllers/api/api.py

rhodecode/model/repo_permission.py

rhodecode/model/repos_group.py

rhodecode/model/users_group.py

0 comments (0 inline, 0 general)

.hgignore

➞

Show inline comments

 syntax: glob
 *.pyc
 *.swp
 *.ini
 Paste*
 syntax: regexp
 ^build
@@ @@ -16,4 +14,3 @@ syntax: regexp @@
 ^test\.db$
 ^repositories\.config$
 ^RhodeCode\.egg-info$
 ^env$

rhodecode/controllers/api/api.py

➞

Show inline comments

@@ @@ -11,6 +11,8 @@ from rhodecode.model.user import UserMod @@
 from rhodecode.model.repo_permission import RepositoryPermissionModel
 from rhodecode.model.users_group import UsersGroupModel
 from rhodecode.model import users_group
 from rhodecode.model.repos_group import ReposGroupModel
 from sqlalchemy.orm.exc import NoResultFound
 log = logging.getLogger( __name__ )
@@ @@ -59,8 +61,9 @@ class ApiController( JSONRPCController ) @@
         :param username
         """
         try:
         user = User.by_username( username )
-        if not user:
+        except NoResultFound:
             return None
         return dict( id = user.user_id,
@@ @@ -109,6 +112,9 @@ class ApiController( JSONRPCController ) @@
         :param ldap_dn:
         """
         if self.get_user( apiuser, username ):
             raise JSONRPCError( "user %s already exist" % username )
         try:
             form_data = dict( username = username,
                              password = password,
@@ @@ -191,6 +197,9 @@ class ApiController( JSONRPCController ) @@
         :param active:
         """
         if self.get_users_group( apiuser, name ):
             raise JSONRPCError( "users group %s already exist" % name )
         try:
             form_data = dict( users_group_name = name,
                              users_group_active = active )
@@ @@ -216,8 +225,9 @@ class ApiController( JSONRPCController ) @@
             if not users_group:
                 raise JSONRPCError( 'unknown users group %s' % group_name )
             try:
             user = User.by_username( user_name )
-            if not user:
+            except NoResultFound:
                 raise JSONRPCError( 'unknown user %s' % user_name )
             ugm = UsersGroupModel().add_user_to_group( users_group, user )
@@ @@ -237,8 +247,9 @@ class ApiController( JSONRPCController ) @@
         :param repo_name
         """
         try:
         repo = Repository.by_repo_name( repo_name )
-        if not repo:
+        except NoResultFound:
             return None
         members = []
@@ @@ -287,8 +298,8 @@ class ApiController( JSONRPCController ) @@
         return result
     @HasPermissionAnyDecorator( 'hg.admin', 'hg.create.repository' )
     def create_repo( self, apiuser, name, owner_name, description = None, repo_type = 'hg', \
                     private = False, group_name = None ):
     def create_repo( self, apiuser, name, owner_name, description = '', repo_type = 'hg', \
                     private = False ):
         """
         Create a repository
@@ @@ -298,29 +309,36 @@ class ApiController( JSONRPCController ) @@
         :param type
         :param private
         :param owner_name
         :param group_name
         :param clone
         """
         try:
             if group_name:
                 group = Group.get_by_group_name( group_name )
                 if group is None:
                     raise JSONRPCError( 'unknown group %s' % group_name )
             else:
                 group = None
             try:
             owner = User.by_username( owner_name )
-            if owner is None:
+            except NoResultFound:
                 raise JSONRPCError( 'unknown user %s' % owner )
             RepoModel().create( { "repo_name" : name,
                                  "repo_name_full" : name,
                                  "description" : description,
                                  "private" : private,
                                  "repo_type" : repo_type,
                                  "repo_group" : group,
                                  "clone_uri" : None }, owner )
             if self.get_repo( apiuser, name ):
                 raise JSONRPCError( "repo %s already exist" % name )
             groups = name.split( '/' )
             real_name = groups[-1]
             groups = groups[:-1]
             parent_id = None
             for g in groups:
                 group = Group.get_by_group_name( g )
                 if not group:
                     group = ReposGroupModel().create( dict( group_name = g,
                                                   group_description = '',
                                                   group_parent_id = parent_id ) )
                 parent_id = group.group_id
             RepoModel().create( dict( repo_name = real_name,
                                      repo_name_full = name,
                                      description = description,
                                      private = private,
                                      repo_type = repo_type,
                                      repo_group = parent_id,
                                      clone_uri = None ), owner )
         except Exception:
             log.error( traceback.format_exc() )
             raise JSONRPCError( 'failed to create repository %s' % name )
@@ @@ -337,12 +355,14 @@ class ApiController( JSONRPCController ) @@
         """
         try:
             try:
             repo = Repository.by_repo_name( repo_name )
-            if not repo:
+            except NoResultFound:
                 raise JSONRPCError( 'unknown repository %s' % repo )
             try:
             user = User.by_username( user_name )
-            if not user:
+            except NoResultFound:
                 raise JSONRPCError( 'unknown user %s' % user )
             RepositoryPermissionModel().updateOrDeleteUserPermission( repo, user, perm )

rhodecode/model/repo_permission.py

➞

Show inline comments

@@ @@ -52,6 +52,7 @@ class RepositoryPermissionModel(BaseMode @@
     def deleteUserPermission(self, repository, user):
         current = self.getUserPermission(repository, user)
         if current:
         Session.delete(current)
         Session.commit()
@@ @@ -59,4 +60,4 @@ class RepositoryPermissionModel(BaseMode @@
         if permission:
             self.updateUserPermission(repository, user, permission)
         else:
             self.deleteUserPermission(repository, user)
@@ \ No newline at end of file @@
             self.deleteUserPermission( repository, user )

rhodecode/model/repos_group.py

➞

Show inline comments

@@ @@ -130,6 +130,7 @@ class ReposGroupModel(BaseModel): @@
                                 form_data['group_parent_id'])
             self.sa.commit()
             return new_repos_group
         except:
             log.error(traceback.format_exc())
             self.sa.rollback()

rhodecode/model/users_group.py

➞

Show inline comments

@@ @@ -67,6 +67,11 @@ class UsersGroupModel( BaseModel ): @@
             raise
     def add_user_to_group( self, users_group, user ):
         for m in users_group.members:
             u = m.user
             if u.user_id == user.user_id:
                 return m
         try:
             users_group_member = UsersGroupMember()
             users_group_member.user = user

0 comments (0 inline, 0 general)