Show More
@@ -77,13 +77,16 b' class AdminSettingsView(BaseAppView):' | |||
|
77 | 77 | raise Exception('Could not get application ui settings !') |
|
78 | 78 | settings = { |
|
79 | 79 | # legacy param that needs to be kept |
|
80 | 'web_push_ssl': False | |
|
80 | 'web_push_ssl': False, | |
|
81 | 'extensions_hgsubversion': False | |
|
81 | 82 | } |
|
82 | 83 | for each in ret: |
|
83 | 84 | k = each.ui_key |
|
84 | 85 | v = each.ui_value |
|
86 | section = each.ui_section | |
|
87 | ||
|
85 | 88 | # skip some options if they are defined |
|
86 | if k in ['push_ssl']: | |
|
89 | if f"{section}_{k}" in ['web_push_ssl', 'extensions_hgsubversion']: | |
|
87 | 90 | continue |
|
88 | 91 | |
|
89 | 92 | if k == '/': |
@@ -98,7 +101,7 b' class AdminSettingsView(BaseAppView):' | |||
|
98 | 101 | if each.ui_section in ['hooks', 'extensions']: |
|
99 | 102 | v = each.ui_active |
|
100 | 103 | |
|
101 |
settings[ |
|
|
104 | settings[section + '_' + k] = v | |
|
102 | 105 | |
|
103 | 106 | return settings |
|
104 | 107 | |
@@ -125,8 +128,6 b' class AdminSettingsView(BaseAppView):' | |||
|
125 | 128 | c.svn_config_path = rhodecode.ConfigGet().get_str(config_keys.config_file_path) |
|
126 | 129 | defaults = self._form_defaults() |
|
127 | 130 | |
|
128 | model.create_largeobjects_dirs_if_needed(defaults['paths_root_path']) | |
|
129 | ||
|
130 | 131 | data = render('rhodecode:templates/admin/settings/settings.mako', |
|
131 | 132 | self._get_template_context(c), self.request) |
|
132 | 133 | html = formencode.htmlfill.render( |
General Comments 0
You need to be logged in to leave comments.
Login now