kallithea Changeset - d5a71348ee4d

Changeset - d5a71348ee4d

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 15 years ago 2010-12-09 19:07:57
marcin@python-works.com

small code fixes to repo model

1 file changed with 13 insertions and 15 deletions:

rhodecode/model/repo.py

0 comments (0 inline, 0 general)

rhodecode/model/repo.py

➞

Show inline comments

@@ @@ -66,56 +66,54 @@ class RepoModel(BaseModel): @@
     def get_users_js(self):
         users = self.sa.query(User).filter(User.active == True).all()
         u_tmpl = '''{id:%s, fname:"%s", lname:"%s", nname:"%s"},'''
         users_array = '[%s];' % '\n'.join([u_tmpl % (u.user_id, u.name,
                                                     u.lastname, u.username)
                                         for u in users])
         return users_array
     def update(self, repo_name, form_data):
         try:
             cur_repo = self.get_by_repo_name(repo_name, cache=False)
             user_model = UserModel(self.sa)
             #update permissions
             for username, perm in form_data['perms_updates']:
                 r2p = self.sa.query(RepoToPerm)\
                         .filter(RepoToPerm.user == UserModel(self.sa)\
                                 .get_by_username(username, cache=False))\
                         .filter(RepoToPerm.repository == \
                                 self.get_by_repo_name(repo_name))\
                         .filter(RepoToPerm.user == user_model.get_by_username(username))\
                         .filter(RepoToPerm.repository == cur_repo)\
                         .one()
                 r2p.permission_id = self.sa.query(Permission).filter(
                                                 Permission.permission_name ==
                                                 perm).one().permission_id
                 r2p.permission = self.sa.query(Permission)\
                                     .filter(Permission.permission_name == perm)\
                                     .scalar()
                 self.sa.add(r2p)
             #set new permissions
             for username, perm in form_data['perms_new']:
                 r2p = RepoToPerm()
                 r2p.repository = self.get_by_repo_name(repo_name)
                 r2p.user = UserModel(self.sa).get_by_username(username, cache=False)
                 r2p.repository = cur_repo
                 r2p.user = user_model.get_by_username(username, cache=False)
                 r2p.permission_id = self.sa.query(Permission).filter(
                                         Permission.permission_name == perm)\
                                         .one().permission_id
                 r2p.permission = self.sa.query(Permission)\
                                     .filter(Permission.permission_name == perm)\
                                     .scalar()
                 self.sa.add(r2p)
             #update current repo
             cur_repo = self.get_by_repo_name(repo_name, cache=False)
             for k, v in form_data.items():
                 if k == 'user':
-                    cur_repo.user_id = v
+                    cur_repo.user = user_model.get(v)
                 else:
                     setattr(cur_repo, k, v)
             self.sa.add(cur_repo)
             if repo_name != form_data['repo_name']:
                 #rename our data
                 self.__rename_repo(repo_name, form_data['repo_name'])
             self.sa.commit()
         except:
             log.error(traceback.format_exc())

0 comments (0 inline, 0 general)