Mercurial > kallithea

changeset 5676:21f07c4b510f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
admin: cleanup Ui table queries
author Søren Løvborg <sorenl@unity3d.com>
date Tue, 05 Jan 2016 19:19:09 +0100
parents c25191aadf92
children 07f63824a52d
files kallithea/controllers/admin/settings.py
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/admin/settings.py	Tue Jan 05 14:48:03 2016 +0100
+++ b/kallithea/controllers/admin/settings.py	Tue Jan 05 19:19:09 2016 +0100
@@ -68,12 +68,12 @@
             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:
@@ -82,7 +82,7 @@
             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')