Commit 6831af94 authored by Thibaut Deheunynck's avatar Thibaut Deheunynck

add test to know if we are in erp5_form render or graphic render and if the...

add test to know if we are in erp5_form render or graphic render and if the field DateTime can be editable or not 

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21540 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 828c8fbb
...@@ -181,7 +181,7 @@ def ERP5Site_createModuleScribus(self, ...@@ -181,7 +181,7 @@ def ERP5Site_createModuleScribus(self,
# attributes to get properties values. # attributes to get properties values.
# This represents the main process of the script. # This represents the main process of the script.
widget_properties = \ widget_properties = \
ScribusParser.getPropertiesConversionDict(text_field_list) ScribusParser.getPropertiesConversionDict(text_field_list, option_html)
LOG('ERP5Site_createModuleScribus', INFO, LOG('ERP5Site_createModuleScribus', INFO,
'createmodule < ScribusParser.getPropertiesConversionDict') 'createmodule < ScribusParser.getPropertiesConversionDict')
......
...@@ -213,7 +213,7 @@ def ERP5Site_updateModuleScribus(self, ...@@ -213,7 +213,7 @@ def ERP5Site_updateModuleScribus(self,
# attributes to get properties values. # attributes to get properties values.
# This represents the main process of the script. # This represents the main process of the script.
widget_properties = \ widget_properties = \
ScribusParser.getPropertiesConversionDict(text_field_list) ScribusParser.getPropertiesConversionDict(text_field_list, option_html)
LOG('ERP5Site_updateModuleScribus', INFO, LOG('ERP5Site_updateModuleScribus', INFO,
'createmodule < ScribusParser.getPropertiesConversionDict') 'createmodule < ScribusParser.getPropertiesConversionDict')
......
...@@ -1149,7 +1149,6 @@ class ManageCSS: ...@@ -1149,7 +1149,6 @@ class ManageCSS:
field_nb_range = field_nb + 1 field_nb_range = field_nb + 1
field_range = range(field_nb_range) field_range = range(field_nb_range)
field_range = field_range
for iterator in field_range: for iterator in field_range:
# iterator take the field_id according to the field_nb # iterator take the field_id according to the field_nb
# ie (0..field_nb) # ie (0..field_nb)
...@@ -1499,7 +1498,7 @@ class ScribusParser: ...@@ -1499,7 +1498,7 @@ class ScribusParser:
security.declarePublic('getPropertiesConversionDict') security.declarePublic('getPropertiesConversionDict')
def getPropertiesConversionDict(self, text_page_dict): def getPropertiesConversionDict(self, text_page_dict, option_html):
""" """
takes a dict generated from 'getXmlObjectsProperties' method takes a dict generated from 'getXmlObjectsProperties' method
and returns a dict of PAGE including a list with usefull and returns a dict of PAGE including a list with usefull
...@@ -1878,6 +1877,10 @@ class ScribusParser: ...@@ -1878,6 +1877,10 @@ class ScribusParser:
# will automatically insert ' ' between element. # will automatically insert ' ' between element.
# > this value is not used in ScribusUtils.py , but in PDFForm.py # > this value is not used in ScribusUtils.py , but in PDFForm.py
# when creating the fdf file to fill the PDF form. # when creating the fdf file to fill the PDF form.
if option_html == 1 and object_properties['editable'] == 1:
object_properties['date_separator'] = ''
object_properties['time_separator'] = ''
else:
object_properties['date_separator'] = \ object_properties['date_separator'] = \
sp.getObjectTooltipProperty('date_separator', sp.getObjectTooltipProperty('date_separator',
'/', '/',
......
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