kallithea Changeset - bc1fff7ae770

Changeset - bc1fff7ae770

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich (mads) - 5 years ago 2020-10-10 20:43:52
mads@kiilerich.com

Grafted from: 219c5105792a

routing: move ADMIN_PREFIX constant from routing to top level kallithea module

Perhaps not the ideal place, but that is how we handle somewhat similar data.
This avoids an unfortunate dependency from the model to routing.

3 files changed with 5 insertions and 6 deletions:

kallithea/__init__.py

kallithea/config/routing.py

kallithea/model/validators.py

0 comments (0 inline, 0 general)

kallithea/__init__.py

➞

Show inline comments

@@ @@ -42,12 +42,14 @@ BACKENDS = { @@
 CELERY_APP = None  # set to Celery app instance if using Celery
 CELERY_EAGER = False
 CONFIG = {}
 # URL prefix for non repository related links - must start with `/`
 ADMIN_PREFIX = '/_admin'
 URL_SEP = '/'
 # Linked module for extensions
 EXTENSIONS = {}
 __version__ = '.'.join(str(each) for each in VERSION)

kallithea/config/routing.py

➞

Show inline comments

@@ @@ -18,19 +18,16 @@ The more specific and detailed routes sh @@
 may take precedent over the more generic routes. For more information
 refer to the routes manual at http://routes.groovie.org/docs/
 """
 import routes
 import kallithea
 from kallithea.lib.utils2 import safe_str
 # prefix for non repository related links needs to be prefixed with `/`
 ADMIN_PREFIX = '/_admin'
 class Mapper(routes.Mapper):
     """
     Subclassed Mapper with routematch patched to decode "unicode" str url to
     *real* unicode str before applying matches and invoking controller methods.
     """
@@ @@ -117,12 +114,13 @@ def make_map(config): @@
                  "http://docutils.sourceforge.net/docs/user/rst/quickref.html",
                  _static=True)
     rmap.connect('kallithea_project_url', "https://kallithea-scm.org/", _static=True)
     rmap.connect('issues_url', 'https://bitbucket.org/conservancy/kallithea/issues', _static=True)
     # ADMIN REPOSITORY ROUTES
     ADMIN_PREFIX = kallithea.ADMIN_PREFIX
     with rmap.submapper(path_prefix=ADMIN_PREFIX,
                         controller='admin/repos') as m:
         m.connect("repos", "/repos",
                   action="create", conditions=dict(method=["POST"]))
         m.connect("repos", "/repos",
                   conditions=dict(method=["GET"]))

kallithea/model/validators.py

➞

Show inline comments

@@ @@ -25,13 +25,12 @@ import ipaddr @@
 import sqlalchemy
 from formencode.validators import CIDR, Bool, Email, FancyValidator, Int, IPAddress, NotEmpty, Number, OneOf, Regex, Set, String, StringBoolean, UnicodeString
 from sqlalchemy import func
 from tg.i18n import ugettext as _
 import kallithea
 from kallithea.config.routing import ADMIN_PREFIX
 from kallithea.lib.auth import HasPermissionAny, HasRepoGroupPermissionLevel
 from kallithea.lib.compat import OrderedSet
 from kallithea.lib.exceptions import InvalidCloneUriException, LdapImportError
 from kallithea.lib.utils import is_valid_repo_uri
 from kallithea.lib.utils2 import asbool, aslist, repo_name_slug
 from kallithea.model.db import RepoGroup, Repository, User, UserGroup
@@ @@ -340,13 +339,13 @@ def ValidRepoName(edit=False, old_data=N @@
         def _validate_python(self, value, state):
             repo_name = value.get('repo_name')
             repo_name_full = value.get('repo_name_full')
             group_path = value.get('group_path')
             group_name = value.get('group_name')
             if repo_name in [ADMIN_PREFIX, '']:
+            if repo_name in [kallithea.ADMIN_PREFIX, '']:
                 msg = self.message('invalid_repo_name', state, repo=repo_name)
                 raise formencode.Invalid(msg, value, state,
                     error_dict=dict(repo_name=msg)
+                )
             rename = old_data.get('repo_name') != repo_name_full

0 comments (0 inline, 0 general)