kallithea Changeset - 8e49b6ceffe1

Changeset - 8e49b6ceffe1

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-02-13 02:48:02
marcin@python-works.com

fixes fixes fixes ! optimized queries on journal
added some logging, fixed found bugs due to previous refactorings

3 files changed with 13 insertions and 7 deletions:

rhodecode/controllers/admin/admin.py

rhodecode/lib/auth.py

rhodecode/lib/helpers.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/admin.py

➞

Show inline comments

@@ @@ -23,30 +23,37 @@ @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 import logging
 from pylons import request, tmpl_context as c
 from sqlalchemy.orm import joinedload
 from webhelpers.paginate import Page
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 from rhodecode.lib.base import BaseController, render
 from rhodecode.model.db import UserLog
 from webhelpers.paginate import Page
 from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator
 log = logging.getLogger(__name__)
 class AdminController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(AdminController, self).__before__()
     @HasPermissionAllDecorator('hg.admin')
     def index(self):
         users_log = self.sa.query(UserLog).order_by(UserLog.action_date.desc())
         users_log = self.sa.query(UserLog)\
                 .options(joinedload(UserLog.user))\
                 .options(joinedload(UserLog.repository))\
                 .order_by(UserLog.action_date.desc())
         p = int(request.params.get('page', 1))
         c.users_log = Page(users_log, page=p, items_per_page=10)
         c.log_data = render('admin/admin_log.html')
         if request.params.get('partial'):
             return c.log_data
         return render('admin/admin.html')

rhodecode/lib/auth.py

➞

Show inline comments

@@ @@ -597,13 +597,13 @@ class HasPermissionAnyMiddleware(object) @@
         self.username = user.username
         self.repo_name = repo_name
         return self.check_permissions()
     def check_permissions(self):
         log.debug('checking mercurial protocol '
                   'permissions for user:%s repository:%s',
+                  'permissions %s for user:%s repository:%s', self.user_perms,
                                                 self.username, self.repo_name)
         if self.required_perms.intersection(self.user_perms):
             log.debug('permission granted')
             return True
         log.debug('permission denied')
         return False

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -438,15 +438,14 @@ def action_parser(user_log): @@
     def get_cs_links():
         revs_limit = 5 #display this amount always
         revs_top_limit = 50 #show upto this amount of changesets hidden
         revs = action_params.split(',')
         repo_name = user_log.repository.repo_name
         from rhodecode.model.scm import ScmModel
         message = lambda rev: get_changeset_safe(ScmModel().get(repo_name),
                                                  rev).message
         repo, dbrepo = ScmModel().get(repo_name, retval='repo')
         message = lambda rev: get_changeset_safe(repo, rev).message
         cs_links = " " + ', '.join ([link_to(rev,
                 url('changeset_home',
                 repo_name=repo_name,
                 revision=rev), title=tooltip(message(rev)),
                 class_='tooltip') for rev in revs[:revs_limit] ])

0 comments (0 inline, 0 general)