kallithea Changeset - 3171614c0067

Changeset - 3171614c0067

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Marcin Kuzminski - 15 years ago 2010-07-28 02:25:47
marcin@python-works.com

Added permissions check on repo switcher,
and cached that for super short cache.
repo switcher css updates

5 files changed with 31 insertions and 11 deletions:

pylons_app/lib/base.py

pylons_app/model/hg_model.py

pylons_app/public/css/style.css

pylons_app/templates/base/base.html

pylons_app/templates/index.html

0 comments (0 inline, 0 general)

pylons_app/lib/base.py

➞

Show inline comments

@@ @@ -5,11 +5,12 @@ Provides the BaseController class for su @@
 from pylons import config, tmpl_context as c, request, session
 from pylons.controllers import WSGIController
 from pylons.templating import render_mako as render
 from pylons_app import __version__
 from pylons_app.lib import auth
 from pylons_app.lib.utils import get_repo_slug
 from pylons_app.model import meta
 from pylons_app.model.hg_model import _get_repos_cached
 from pylons_app import __version__
 from pylons_app.model.hg_model import _get_repos_cached, \
     _get_repos_switcher_cached
 class BaseController(WSGIController):
@@ @@ -18,6 +19,7 @@ class BaseController(WSGIController): @@
         c.hg_app_name = config['hg_app_name']
         c.repo_name = get_repo_slug(request)
         c.cached_repo_list = _get_repos_cached()
         c.repo_switcher_list = _get_repos_switcher_cached(c.cached_repo_list)
         self.sa = meta.Session
     def __call__(self, environ, start_response):

pylons_app/model/hg_model.py

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 # encoding: utf-8
 # Model for hg app
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+#
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
@@ @@ -25,10 +25,12 @@ Model for hg app @@
 from beaker.cache import cache_region
 from mercurial import ui
 from mercurial.hgweb.hgwebdir_mod import findrepos
 from vcs.exceptions import RepositoryError, VCSError
 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 sqlalchemy.orm import joinedload
 from vcs.exceptions import RepositoryError, VCSError
 import logging
 import os
 import sys
@@ @@ -56,6 +58,15 @@ def _get_repos_cached(): @@
     from pylons import app_globals as g
     return HgModel.repo_scan(g.paths[0][0], g.paths[0][1], g.baseui)
 @cache_region('super_short_term', 'cached_repos_switcher_list')
 def _get_repos_switcher_cached(cached_repo_list):
     repos_lst = []
     for repo in sorted(x.name.lower() for x in cached_repo_list.values()):
         if HasRepoPermissionAny('repository.write', 'repository.read', 'repository.admin')(repo, 'main page check'):
             repos_lst.append(repo)
     return repos_lst
 @cache_region('long_term', 'full_changelog')
 def _full_changelog_cached(repo_name):
     log.info('getting full changelog for %s', repo_name)

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -3197,6 +3197,15 @@ table.code-browser .browser-dir { @@
+}
 /* -----------------------------------------------------------
     REPO SWITCHER
 ----------------------------------------------------------- */
 #switch_repos{
 	position: absolute;
 	height: 25px;
 	z-index: 1;
+}
 /* -----------------------------------------------------------
     BREADCRUMBS
 ----------------------------------------------------------- */

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -91,15 +91,13 @@ @@
+                    }
                     else{
                         YAHOO.util.Dom.setStyle('switch_repos','display','');
                         //YAHOO.util.Dom.setStyle('repo_switcher','background','#FFFFFF');
                         //YAHOO.util.Dom.setStyle('repo_switcher','color','#556CB5');
                         YAHOO.util.Dom.addClass('repo_switcher','selected');
+                    }
                     });
                 YAHOO.util.Event.addListener('repos_list','change',function(e){
                     var wa = YAHOO.util.Dom.get('repos_list').value;
-                    var url = "${h.url('summary_home',repo_name='__REPLACE__')}".replace('__REPLACE__',wa);
+                    var url = "${h.url('summary_home',repo_name='__REPO__')}".replace('__REPO__',wa);
                     window.location = url;
                 })
                });
@@ @@ -115,9 +113,9 @@ @@
                     </span>
                     <span>&darr;</span>
 					</a>
 					<div id="switch_repos" style="display:none;position: absolute;height: 25px;z-index: 1">
 						<select id="repos_list" size="=10" style="min-width: 150px">
 						%for repo in sorted(x.name.lower() for x in c.cached_repo_list.values()):
 					<div id="switch_repos" style="display:none;">
 						<select id="repos_list" size="10">
 						%for repo in c.repo_switcher_list:
 							<option value="${repo}">${repo}</option>
 						%endfor
 						</select>

pylons_app/templates/index.html

➞

Show inline comments

@@ @@ -51,7 +51,7 @@ @@
             </thead>
                         <tbody>
 					    %for cnt,repo in enumerate(c.repos_list):
-					        %if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(repo['name'],'main page check'):
+					        %if repo['name'] in c.repo_switcher_list:
 					        <tr class="parity${cnt%2}">
 					            <td>
 					             %if repo['repo'].dbrepo.private:

0 comments (0 inline, 0 general)