Commit a9e39220 by Piotr Mitros

HTML module looks in html directory in data

parent 22f4004e
...@@ -17,13 +17,16 @@ class HtmlModule(XModule): ...@@ -17,13 +17,16 @@ class HtmlModule(XModule):
return "html" return "html"
def get_html(self): def get_html(self):
if self.filename!=None: if self.filename==None:
return render_to_string(self.filename, {'id': self.item_id})
else:
xmltree=etree.fromstring(self.xml) xmltree=etree.fromstring(self.xml)
textlist=[xmltree.text]+[etree.tostring(i) for i in xmltree]+[xmltree.tail] textlist=[xmltree.text]+[etree.tostring(i) for i in xmltree]+[xmltree.tail]
textlist=[i for i in textlist if type(i)==str] textlist=[i for i in textlist if type(i)==str]
return "".join(textlist) return "".join(textlist)
try:
filename=settings.DATA_DIR+"html/"+self.filename+".xml"
return open(filename).read()
except: # For backwards compatibility. TODO: Remove
return render_to_string(self.filename, {'id': self.item_id})
def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None): def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None):
XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function) XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function)
......
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