Commit 66b6ed8d authored by Arnaud Fontaine's avatar Arnaud Fontaine

Add submitReport() and fix submitPrint() using the class attribute

rather than the name and update submit() API accordingly because the
name is not enough as it is context-dependent


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@44966 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c865e875
...@@ -419,13 +419,38 @@ class MainForm(Form): ...@@ -419,13 +419,38 @@ class MainForm(Form):
""" """
__metaclass__ = measurementMetaClass(prefix='submit') __metaclass__ = measurementMetaClass(prefix='submit')
def submit(self, label=None, name=None, index=None, *args, **kwargs): def submit(self, label=None, name=None, class_attribute=None, index=None,
*args, **kwargs):
""" """
Overriden for logging purpose, and for specifying a default index Overriden for logging purpose, and for specifying a default index
to 0 if not set, thus avoiding AmbiguityError being raised (in to 0 if not set, thus avoiding AmbiguityError being raised (in
ERP5 there may be several submit fields with the same name) ERP5 there may be several submit fields with the same name).
Also, allows to select a submit by its class attribute, which
basically look for the first element whose C{attribute} is
C{class_attribute} then call C{submit} with the element C{name}.
@param class_attribute: Submit according to the class attribute
@type class_attribute: str
@raise LookupError: Could not find any element matching the given
class attribute name, if class_attribute
parameter is given.
""" """
logging.debug("Submitting (name='%s', label='%s')" % (name, label)) logging.debug("Submitting (name='%s', label='%s', class='%s')" % \
(name, label, class_attribute))
if class_attribute:
element_list = self.browser.etree.xpath('//*[contains(@class, "%s")]' % \
class_attribute)
try:
name = element_list[0].get('name')
except (IndexError, AttributeError):
name = None
if not name:
raise LookupError("Could not find any '%s' element" % class_attribute)
if label is None and name is None: if label is None and name is None:
super(MainForm, self).submit(label=label, name=name, *args, **kwargs) super(MainForm, self).submit(label=label, name=name, *args, **kwargs)
...@@ -600,9 +625,17 @@ class ContextMainForm(MainForm): ...@@ -600,9 +625,17 @@ class ContextMainForm(MainForm):
def submitPrint(self): def submitPrint(self):
""" """
Print the previously selected objects. Print the previously selected objects. Use the class attribute
rather than the name as the latter is dependent on the context.
"""
self.submit(class_attribute='print')
def submitReport(self):
"""
Create a report. Use the class attribute rather than the name as
the latter is dependent on the context.
""" """
self.submit(name='Folder_print:method') self.submit(class_attribute='report')
def submitNew(self): def submitNew(self):
""" """
......
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