kallithea Changeset - 21f07c4b510f

Changeset - 21f07c4b510f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Søren Løvborg - 10 years ago 2016-01-05 19:19:09
sorenl@unity3d.com

admin: cleanup Ui table queries

1 file changed with 5 insertions and 5 deletions:

kallithea/controllers/admin/settings.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -65,27 +65,27 @@ class SettingsController(BaseController) @@
         ret = Ui.query().all()
         if not ret:
             raise Exception('Could not get application ui settings !')
         settings = {}
         for each in ret:
             k = each.ui_key
+            k = each.ui_section + '_' + each.ui_key
             v = each.ui_value
             if k == '/':
                 k = 'root_path'
             if k == 'paths_/':
                 k = 'paths_root_path'
-            if k == 'push_ssl':
+            if k == 'web_push_ssl':
                 v = str2bool(v)
             if k.find('.') != -1:
                 k = k.replace('.', '_')
             if each.ui_section in ['hooks', 'extensions']:
                 v = each.ui_active
-            settings[each.ui_section + '_' + k] = v
             settings[k] = v
         return settings
     @HasPermissionAllDecorator('hg.admin')
     def settings_vcs(self):
         """GET /admin/settings: All items in the collection"""
         # url('admin_settings')

0 comments (0 inline, 0 general)