Return-Path: X-Original-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-allura-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B5B5DD4F1 for ; Sun, 4 Nov 2012 19:53:15 +0000 (UTC) Received: (qmail 13902 invoked by uid 500); 4 Nov 2012 19:53:15 -0000 Delivered-To: apmail-incubator-allura-commits-archive@incubator.apache.org Received: (qmail 13821 invoked by uid 500); 4 Nov 2012 19:53:15 -0000 Mailing-List: contact allura-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: allura-dev@incubator.apache.org Delivered-To: mailing list allura-commits@incubator.apache.org Received: (qmail 12738 invoked by uid 99); 4 Nov 2012 19:53:14 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 04 Nov 2012 19:53:14 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 33DDE52D0A; Sun, 4 Nov 2012 19:53:14 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: johnsca@apache.org To: allura-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [34/50] git commit: [#3883] Remove hardcoded SCM tools' names, minor fixes and cleanups. Message-Id: <20121104195314.33DDE52D0A@tyr.zones.apache.org> Date: Sun, 4 Nov 2012 19:53:14 +0000 (UTC) [#3883] Remove hardcoded SCM tools' names, minor fixes and cleanups. Signed-off-by: Peter Hartmann Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/ef8eb12d Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/ef8eb12d Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/ef8eb12d Branch: refs/heads/cj/4691 Commit: ef8eb12d51d6b371aed2821d843cb319306783c9 Parents: 6f41364 Author: Peter Hartmann Authored: Wed Sep 12 18:36:53 2012 +0200 Committer: Cory Johns Committed: Fri Oct 26 20:28:37 2012 +0000 ---------------------------------------------------------------------- Allura/allura/controllers/auth.py | 2 +- Allura/allura/ext/admin/admin_main.py | 5 ++++- .../allura/ext/admin/templates/project_admin.html | 13 +++++-------- Allura/allura/lib/plugin.py | 2 +- .../widgets/neighborhood_add_project.html | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef8eb12d/Allura/allura/controllers/auth.py ---------------------------------------------------------------------- diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py index 0f0815f..c43b571 100644 --- a/Allura/allura/controllers/auth.py +++ b/Allura/allura/controllers/auth.py @@ -222,7 +222,7 @@ class AuthController(BaseController): for p in user.my_projects(): for p in [p] + p.direct_subprojects.all(): for app in p.app_configs: - if not isinstance(app, RepositoryApp): + if not issubclass(g.entry_points["tool"][app.tool_name], RepositoryApp): continue if not has_access(app, 'write', user, p): continue http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef8eb12d/Allura/allura/ext/admin/admin_main.py ---------------------------------------------------------------------- diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py index 51ce063..807f20d 100644 --- a/Allura/allura/ext/admin/admin_main.py +++ b/Allura/allura/ext/admin/admin_main.py @@ -14,6 +14,7 @@ from allura.app import Application, DefaultAdminController, SitemapEntry from allura.lib import helpers as h from allura import version from allura import model as M +from allura.lib.repository import RepositoryApp from allura.lib.security import has_access, require_access from allura.lib.widgets import form_fields as ffw from allura.lib import exceptions as forge_exc @@ -139,7 +140,9 @@ class ProjectAdminController(BaseController): @with_trailing_slash @expose('jinja:allura.ext.admin:templates/project_admin.html') def index(self, **kw): - return dict() + scm_tools = [tool for tool in c.project.app_configs if issubclass( + g.entry_points["tool"][tool.tool_name], RepositoryApp)] + return dict(scm_tools=scm_tools) @without_trailing_slash @expose('jinja:allura.ext.admin:templates/project_invitations.html') http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef8eb12d/Allura/allura/ext/admin/templates/project_admin.html ---------------------------------------------------------------------- diff --git a/Allura/allura/ext/admin/templates/project_admin.html b/Allura/allura/ext/admin/templates/project_admin.html index 9b6473d..519fac2 100644 --- a/Allura/allura/ext/admin/templates/project_admin.html +++ b/Allura/allura/ext/admin/templates/project_admin.html @@ -1,6 +1,5 @@ {% extends g.theme.master %} {% set wiki_found = False %} -{% set code_found = False %} {% set tracker_found = False %} {% set forum_found = False %} @@ -49,13 +48,11 @@

Source Control Management will help you keep track of code changes over time. A repository has already been created, checkout, add files and upload code.

- {% for tool in c.project.app_configs %} - {% if ('code' in tool.options.mount_point) and not code_found %} - Checkout repo
- View source - {% set code_found = True %} - {% endif %} - {% endfor %} + {% if scm_tools %} + {% set tool = scm_tools[0] %} + Checkout repo
+ View source + {% endif %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef8eb12d/Allura/allura/lib/plugin.py ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py index e75365d..13356b1 100644 --- a/Allura/allura/lib/plugin.py +++ b/Allura/allura/lib/plugin.py @@ -315,7 +315,7 @@ class ProjectRegistrationProvider(object): name="tools", options=[ forms.ew.Option(label=tool.tool_label, html_value=tool.tool_label) \ for tool in g.entry_points["tool"].itervalues() if tool.installable - ] + ], selected=True ) @classmethod http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/ef8eb12d/Allura/allura/templates/widgets/neighborhood_add_project.html ---------------------------------------------------------------------- diff --git a/Allura/allura/templates/widgets/neighborhood_add_project.html b/Allura/allura/templates/widgets/neighborhood_add_project.html index 07ea5c1..ad3fbd8 100644 --- a/Allura/allura/templates/widgets/neighborhood_add_project.html +++ b/Allura/allura/templates/widgets/neighborhood_add_project.html @@ -33,7 +33,7 @@ {% if tool.installable %}
{{ tool.tool_label}} icon -