1.1 --- a/XSLForms/Resources/WebResources.py Sun Nov 18 17:21:57 2007 +0000
1.2 +++ b/XSLForms/Resources/WebResources.py Sun Nov 18 17:22:07 2007 +0000
1.3 @@ -353,13 +353,13 @@
1.4 """
1.5
1.6 documents = form.get_documents()
1.7 - activity = self.get_activity(trans)
1.8 + activity = form.get_activity()
1.9
1.10 if documents.has_key(activity):
1.11 - self.set_document(trans, documents[activity])
1.12 + form.set_document(documents[activity])
1.13 return 0
1.14 else:
1.15 - self.set_document(trans, form.new_instance(activity))
1.16 + form.set_document(form.new_instance(activity))
1.17 return 1
1.18
1.19 def respond_to_input(self, trans, form):
1.20 @@ -382,11 +382,10 @@
1.21
1.22 # Transform, adding enumerations/ranges.
1.23
1.24 - init_xsl = self.prepare_initialiser(self.get_activity(trans))
1.25 - self.set_document(
1.26 - trans,
1.27 + init_xsl = self.prepare_initialiser(form.get_activity())
1.28 + form.set_document(
1.29 self.get_result(
1.30 - [init_xsl], self.get_document(trans), stylesheet_parameters,
1.31 + [init_xsl], form.get_document(), stylesheet_parameters,
1.32 stylesheet_expressions, references
1.33 )
1.34 )
1.35 @@ -428,27 +427,13 @@
1.36 trans_xsl = self.prepare_fragment(in_page_resource)
1.37 stylesheet_parameters.update(self.prepare_parameters(parameters))
1.38 else:
1.39 - trans_xsl = self.prepare_output(self.get_activity(trans))
1.40 + trans_xsl = self.prepare_output(form.get_activity())
1.41
1.42 # Complete the response.
1.43
1.44 - self.send_output(trans, [trans_xsl], self.get_document(trans),
1.45 + self.send_output(trans, [trans_xsl], form.get_document(),
1.46 stylesheet_parameters, stylesheet_expressions, references)
1.47
1.48 - # Helper methods related to the modular handling of requests.
1.49 -
1.50 - def set_activity(self, trans, name):
1.51 - trans.get_attributes()["current_activity"] = name
1.52 -
1.53 - def get_activity(self, trans):
1.54 - return trans.get_attributes().get("current_activity")
1.55 -
1.56 - def set_document(self, trans, doc):
1.57 - trans.get_attributes()["current_document"] = doc
1.58 -
1.59 - def get_document(self, trans):
1.60 - return trans.get_attributes().get("current_document")
1.61 -
1.62 # General helper methods.
1.63
1.64 def add_elements(self, positions, *element_names):