equal
deleted
inserted
replaced
79 """the WebConfiguration is a singleton object handling instance's |
79 """the WebConfiguration is a singleton object handling instance's |
80 configuration and preferences |
80 configuration and preferences |
81 """ |
81 """ |
82 cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set([join('web', 'views')]) |
82 cubicweb_appobject_path = CubicWebConfiguration.cubicweb_appobject_path | set([join('web', 'views')]) |
83 cube_appobject_path = CubicWebConfiguration.cube_appobject_path | set(['views']) |
83 cube_appobject_path = CubicWebConfiguration.cube_appobject_path | set(['views']) |
84 uiprops = {'FCKEDITOR_PATH': ''} |
|
85 |
84 |
86 options = merge_options(CubicWebConfiguration.options + ( |
85 options = merge_options(CubicWebConfiguration.options + ( |
87 ('repository-uri', |
86 ('repository-uri', |
88 {'type' : 'string', |
87 {'type' : 'string', |
89 'default': 'inmemory://', |
88 'default': 'inmemory://', |
242 self.https_uiprops = None |
241 self.https_uiprops = None |
243 self.datadir_url = None |
242 self.datadir_url = None |
244 self.https_datadir_url = None |
243 self.https_datadir_url = None |
245 |
244 |
246 def fckeditor_installed(self): |
245 def fckeditor_installed(self): |
247 return exists(self.uiprops['FCKEDITOR_PATH']) |
246 if self.uiprops is None: |
|
247 return False |
|
248 return exists(self.uiprops.get('FCKEDITOR_PATH', '')) |
248 |
249 |
249 def cwproperty_definitions(self): |
250 def cwproperty_definitions(self): |
250 for key, pdef in super(WebConfiguration, self).cwproperty_definitions(): |
251 for key, pdef in super(WebConfiguration, self).cwproperty_definitions(): |
251 if key == 'ui.fckeditor' and not self.fckeditor_installed(): |
252 if key == 'ui.fckeditor' and not self.fckeditor_installed(): |
252 continue |
253 continue |