equal
deleted
inserted
replaced
27 from warnings import warn |
27 from warnings import warn |
28 |
28 |
29 from six import text_type |
29 from six import text_type |
30 |
30 |
31 from logilab.common.decorators import cached, cachedproperty |
31 from logilab.common.decorators import cached, cachedproperty |
32 from logilab.common.deprecation import deprecated |
|
33 from logilab.common.configuration import merge_options |
32 from logilab.common.configuration import merge_options |
34 |
33 |
35 from cubicweb import ConfigurationError |
34 from cubicweb import ConfigurationError |
36 from cubicweb.toolsutils import read_config |
35 from cubicweb.toolsutils import read_config |
37 from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options |
36 from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options |
289 def cwproperty_definitions(self): |
288 def cwproperty_definitions(self): |
290 for key, pdef in super(WebConfiguration, self).cwproperty_definitions(): |
289 for key, pdef in super(WebConfiguration, self).cwproperty_definitions(): |
291 if key == 'ui.fckeditor' and not self.fckeditor_installed(): |
290 if key == 'ui.fckeditor' and not self.fckeditor_installed(): |
292 continue |
291 continue |
293 yield key, pdef |
292 yield key, pdef |
294 |
|
295 @deprecated('[3.22] call req.cnx.repo.get_versions() directly') |
|
296 def vc_config(self): |
|
297 return self.repository().get_versions() |
|
298 |
293 |
299 @cachedproperty |
294 @cachedproperty |
300 def _instance_salt(self): |
295 def _instance_salt(self): |
301 """This random key/salt is used to sign content to be sent back by |
296 """This random key/salt is used to sign content to be sent back by |
302 browsers, eg. in the error report form. |
297 browsers, eg. in the error report form. |