Commit f87a5fbb by Vasyl Nakvasiuk

fix GraphicalSliderToolModule

parent 1bfb9335
...@@ -45,15 +45,7 @@ class GraphicalSliderToolModule(XModule): ...@@ -45,15 +45,7 @@ class GraphicalSliderToolModule(XModule):
js_module_name = "GraphicalSliderTool" js_module_name = "GraphicalSliderTool"
render = String(scope=Scope.content) render = String(scope=Scope.content)
configuration = String(scope=Scope.content)
def __init__(self, system, location, definition, descriptor, instance_state=None,
shared_state=None, **kwargs):
"""
For XML file format please look at documentation. TODO - receive
information where to store XML documentation.
"""
XModule.__init__(self, system, location, definition, descriptor,
instance_state, shared_state, **kwargs)
def get_html(self): def get_html(self):
""" Renders parameters to template. """ """ Renders parameters to template. """
...@@ -68,9 +60,9 @@ class GraphicalSliderToolModule(XModule): ...@@ -68,9 +60,9 @@ class GraphicalSliderToolModule(XModule):
'element_class': self.html_class, 'element_class': self.html_class,
'configuration_json': self.configuration_json 'configuration_json': self.configuration_json
} }
self.content = self.system.render_template( content = self.system.render_template(
'graphical_slider_tool.html', params) 'graphical_slider_tool.html', params)
return self.content return content
def substitute_controls(self, html_string): def substitute_controls(self, html_string):
""" Substitutes control elements (slider, textbox and plot) in """ Substitutes control elements (slider, textbox and plot) in
...@@ -142,7 +134,7 @@ class GraphicalSliderToolModule(XModule): ...@@ -142,7 +134,7 @@ class GraphicalSliderToolModule(XModule):
# <root> added for interface compatibility with xmltodict.parse # <root> added for interface compatibility with xmltodict.parse
# class added for javascript's part purposes # class added for javascript's part purposes
return json.dumps(xmltodict.parse('<root class="' + self.html_class + return json.dumps(xmltodict.parse('<root class="' + self.html_class +
'">' + self.definition['configuration'] + '</root>')) '">' + self.configuration + '</root>'))
class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor): class GraphicalSliderToolDescriptor(MakoModuleDescriptor, XmlDescriptor):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment