kallithea Changeset - 7fbf81447c6c

Changeset - 7fbf81447c6c

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-07-30 22:12:06
marcin@python-works.com

Fixes #18, removing user, who owns some repositories

2 files changed with 13 insertions and 2 deletions:

pylons_app/controllers/admin/repos.py

pylons_app/model/hg_model.py

0 comments (0 inline, 0 general)

pylons_app/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -24,6 +24,7 @@ admin controller for pylons @@
 """
 from formencode import htmlfill
 from operator import itemgetter
 from paste.httpexceptions import HTTPInternalServerError
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _
@@ @@ -31,13 +32,13 @@ from pylons_app.lib import helpers as h @@
 from pylons_app.lib.auth import LoginRequired, HasPermissionAllDecorator
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.utils import invalidate_cache
 from pylons_app.model.db import User
 from pylons_app.model.forms import RepoForm
 from pylons_app.model.hg_model import HgModel
 from pylons_app.model.repo_model import RepoModel
 import formencode
 import logging
 import traceback
 from paste.httpexceptions import HTTPInternalServerError
 log = logging.getLogger(__name__)
@@ @@ -196,7 +197,13 @@ class ReposController(BaseController): @@
             return redirect(url('repos'))
         defaults = c.repo_info.__dict__
         if c.repo_info.user:
         defaults.update({'user':c.repo_info.user.username})
         else:
             replacement_user = self.sa.query(User)\
             .filter(User.admin == True).first().username
             defaults.update({'user':replacement_user})
         c.users_array = repo_model.get_users_js()
         for p in c.repo_info.repo2perm:

pylons_app/model/hg_model.py

➞

Show inline comments

@@ @@ -28,7 +28,7 @@ from mercurial.hgweb.hgwebdir_mod import @@
 from pylons.i18n.translation import _
 from pylons_app.lib.auth import HasRepoPermissionAny
 from pylons_app.model import meta
 from pylons_app.model.db import Repository
+from pylons_app.model.db import Repository, User
 from sqlalchemy.orm import joinedload
 from vcs.exceptions import RepositoryError, VCSError
 import logging
@@ @@ -134,7 +134,11 @@ class HgModel(object): @@
                         log.info('Adding db instance to cached list')
                         repos_list[name].dbrepo = dbrepo
                         repos_list[name].description = dbrepo.description
                         if dbrepo.user:
                         repos_list[name].contact = dbrepo.user.full_contact
                         else:
                             repos_list[name].contact = sa.query(User)\
                             .filter(User.admin == True).first().full_contact
             except OSError:
                 continue
         meta.Session.remove()

0 comments (0 inline, 0 general)