Mercurial > kallithea

changeset 8694:aed6e9a762f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
db: consistently use the name settings for the return value from get_app_settings Get rid of yet another old rc reference. (The "settings" in auth is slightly different, but pretty much the same.)
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 12 Oct 2020 17:30:51 +0200
parents b9b53e25a08d
children 9ca3ebee3fd8
files kallithea/lib/auth_modules/__init__.py kallithea/lib/base.py kallithea/lib/utils.py kallithea/model/db.py
diffstat 4 files changed, 21 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/lib/auth_modules/__init__.py	Mon Oct 19 12:18:28 2020 +0200
+++ b/kallithea/lib/auth_modules/__init__.py	Mon Oct 12 17:30:51 2020 +0200
@@ -180,8 +180,8 @@
         OVERRIDING THIS METHOD WILL CAUSE YOUR PLUGIN TO FAIL.
         """
 
-        rcsettings = self.settings()
-        rcsettings.insert(0, {
+        settings = self.settings()
+        settings.insert(0, {
             "name": "enabled",
             "validator": self.validators.StringBoolean(if_missing=False),
             "type": "bool",
@@ -189,7 +189,7 @@
             "formname": "Enabled"
             }
         )
-        return rcsettings
+        return settings
 
     def auth(self, userobj, username, passwd, settings, **kwargs):
         """
--- a/kallithea/lib/base.py	Mon Oct 19 12:18:28 2020 +0200
+++ b/kallithea/lib/base.py	Mon Oct 12 17:30:51 2020 +0200
@@ -368,23 +368,23 @@
                 raise webob.exc.HTTPForbidden()
 
         c.kallithea_version = kallithea.__version__
-        rc_config = db.Setting.get_app_settings()
+        settings = db.Setting.get_app_settings()
 
         # Visual options
         c.visual = AttributeDict({})
 
         ## DB stored
-        c.visual.show_public_icon = asbool(rc_config.get('show_public_icon'))
-        c.visual.show_private_icon = asbool(rc_config.get('show_private_icon'))
-        c.visual.stylify_metalabels = asbool(rc_config.get('stylify_metalabels'))
-        c.visual.page_size = safe_int(rc_config.get('dashboard_items', 100))
-        c.visual.admin_grid_items = safe_int(rc_config.get('admin_grid_items', 100))
-        c.visual.repository_fields = asbool(rc_config.get('repository_fields'))
-        c.visual.show_version = asbool(rc_config.get('show_version'))
-        c.visual.use_gravatar = asbool(rc_config.get('use_gravatar'))
-        c.visual.gravatar_url = rc_config.get('gravatar_url')
+        c.visual.show_public_icon = asbool(settings.get('show_public_icon'))
+        c.visual.show_private_icon = asbool(settings.get('show_private_icon'))
+        c.visual.stylify_metalabels = asbool(settings.get('stylify_metalabels'))
+        c.visual.page_size = safe_int(settings.get('dashboard_items', 100))
+        c.visual.admin_grid_items = safe_int(settings.get('admin_grid_items', 100))
+        c.visual.repository_fields = asbool(settings.get('repository_fields'))
+        c.visual.show_version = asbool(settings.get('show_version'))
+        c.visual.use_gravatar = asbool(settings.get('use_gravatar'))
+        c.visual.gravatar_url = settings.get('gravatar_url')
 
-        c.ga_code = rc_config.get('ga_code')
+        c.ga_code = settings.get('ga_code')
         # TODO: replace undocumented backwards compatibility hack with db upgrade and rename ga_code
         if c.ga_code and '<' not in c.ga_code:
             c.ga_code = '''<script type="text/javascript">
@@ -398,9 +398,9 @@
                     var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
                     })();
             </script>''' % c.ga_code
-        c.site_name = rc_config.get('title')
-        c.clone_uri_tmpl = rc_config.get('clone_uri_tmpl') or db.Repository.DEFAULT_CLONE_URI
-        c.clone_ssh_tmpl = rc_config.get('clone_ssh_tmpl') or db.Repository.DEFAULT_CLONE_SSH
+        c.site_name = settings.get('title')
+        c.clone_uri_tmpl = settings.get('clone_uri_tmpl') or db.Repository.DEFAULT_CLONE_URI
+        c.clone_ssh_tmpl = settings.get('clone_ssh_tmpl') or db.Repository.DEFAULT_CLONE_SSH
 
         ## INI stored
         c.visual.allow_repo_location_change = asbool(config.get('allow_repo_location_change', True))
--- a/kallithea/lib/utils.py	Mon Oct 19 12:18:28 2020 +0200
+++ b/kallithea/lib/utils.py	Mon Oct 12 17:30:51 2020 +0200
@@ -352,8 +352,8 @@
 
     :param config:
     """
-    hgsettings = db.Setting.get_app_settings()
-    for k, v in hgsettings.items():
+    settings = db.Setting.get_app_settings()
+    for k, v in settings.items():
         config[k] = v
     config['base_path'] = db.Ui.get_repos_location()
 
--- a/kallithea/model/db.py	Mon Oct 19 12:18:28 2020 +0200
+++ b/kallithea/model/db.py	Mon Oct 12 17:30:51 2020 +0200
@@ -1158,8 +1158,8 @@
             ))
         if with_pullrequests:
             data['pull_requests'] = repo.pull_requests_other
-        rc_config = Setting.get_app_settings()
-        repository_fields = asbool(rc_config.get('repository_fields'))
+        settings = Setting.get_app_settings()
+        repository_fields = asbool(settings.get('repository_fields'))
         if repository_fields:
             for f in self.extra_fields:
                 data[f.field_key_prefixed] = f.field_value