Show More
@@ -149,6 +149,13 b' class DbManage(object):' | |||
|
149 | 149 | hooks4.ui_key = 'preoutgoing.pull_logger' |
|
150 | 150 | hooks4.ui_value = 'python:rhodecode.lib.hooks.log_pull_action' |
|
151 | 151 | |
|
152 | #for mercurial 1.7 set backward comapatibility with format | |
|
153 | ||
|
154 | dotencode_disable = RhodeCodeUi() | |
|
155 | dotencode_disable.ui_section = 'format' | |
|
156 | dotencode_disable.ui_key = 'dotencode' | |
|
157 | dotencode_disable.ui_section = 'false' | |
|
158 | ||
|
152 | 159 | |
|
153 | 160 | web1 = RhodeCodeUi() |
|
154 | 161 | web1.ui_section = 'web' |
@@ -181,8 +188,6 b' class DbManage(object):' | |||
|
181 | 188 | |
|
182 | 189 | |
|
183 | 190 | try: |
|
184 | ||
|
185 | ||
|
186 | 191 | self.sa.add(hooks1) |
|
187 | 192 | self.sa.add(hooks2) |
|
188 | 193 | self.sa.add(hooks3) |
@@ -194,6 +199,7 b' class DbManage(object):' | |||
|
194 | 199 | self.sa.add(paths) |
|
195 | 200 | self.sa.add(hgsettings1) |
|
196 | 201 | self.sa.add(hgsettings2) |
|
202 | self.sa.add(dotencode_disable) | |
|
197 | 203 | for k in ['ldap_active', 'ldap_host', 'ldap_port', 'ldap_ldaps', |
|
198 | 204 | 'ldap_dn_user', 'ldap_dn_pass', 'ldap_base_dn']: |
|
199 | 205 |
@@ -212,12 +212,15 b" def make_ui(read_from='file', path=None," | |||
|
212 | 212 | ret = sa.query(RhodeCodeUi)\ |
|
213 | 213 | .options(FromCache("sql_cache_short", |
|
214 | 214 | "get_hg_ui_settings")).all() |
|
215 | meta.Session.remove() | |
|
215 | ||
|
216 | 216 | hg_ui = ret |
|
217 | 217 | for ui_ in hg_ui: |
|
218 | 218 | if ui_.ui_active: |
|
219 |
log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, |
|
|
219 | log.debug('settings ui from db[%s]%s:%s', ui_.ui_section, | |
|
220 | ui_.ui_key, ui_.ui_value) | |
|
220 | 221 | baseui.setconfig(ui_.ui_section, ui_.ui_key, ui_.ui_value) |
|
222 | ||
|
223 | meta.Session.remove() | |
|
221 | 224 | return baseui |
|
222 | 225 | |
|
223 | 226 |
General Comments 0
You need to be logged in to leave comments.
Login now