kallithea Changeset - aed6e9a762f3

Changeset - aed6e9a762f3

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Mads Kiilerich (mads) - 5 years ago 2020-10-12 17:30:51
mads@kiilerich.com

Grafted from: 7527f81871c7

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.)

4 files changed with 21 insertions and 21 deletions:

kallithea/lib/auth_modules/__init__.py

kallithea/lib/base.py

kallithea/lib/utils.py

kallithea/model/db.py

0 comments (0 inline, 0 general)

kallithea/lib/auth_modules/__init__.py

➞

Show inline comments

@@ @@ -180,8 +180,8 @@ class KallitheaAuthPluginBase(object): @@
         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 @@ class KallitheaAuthPluginBase(object): @@
             "formname": "Enabled"
+            }
+        )
-        return rcsettings
+        return settings
     def auth(self, userobj, username, passwd, settings, **kwargs):
         """

kallithea/lib/base.py

➞

Show inline comments

@@ @@ -368,23 +368,23 @@ class BaseController(TGController): @@
                 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 @@ class BaseController(TGController): @@
                     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))

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -352,8 +352,8 @@ def set_app_settings(config): @@
     :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()

kallithea/model/db.py

➞

Show inline comments

@@ @@ -1158,8 +1158,8 @@ class Repository(meta.Base, BaseDbModel) @@
             ))
         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

0 comments (0 inline, 0 general)