Commit e694d57a authored by Rafael Monnerat's avatar Rafael Monnerat

Prevent to show blocs when the planning box should not have any blocs showed.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14503 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent d313ad41
...@@ -928,7 +928,6 @@ class PlanningBoxWidget(Widget.Widget): ...@@ -928,7 +928,6 @@ class PlanningBoxWidget(Widget.Widget):
external PageTemplate (or DTML depending) to render the CSS code external PageTemplate (or DTML depending) to render the CSS code
relative to the structure that need to be rendered relative to the structure that need to be rendered
""" """
here = REQUEST['here'] here = REQUEST['here']
# build structure # build structure
# render_structure will call all method necessary to build the entire # render_structure will call all method necessary to build the entire
...@@ -936,7 +935,6 @@ class PlanningBoxWidget(Widget.Widget): ...@@ -936,7 +935,6 @@ class PlanningBoxWidget(Widget.Widget):
# creates and fill up self.basic, self.planning and self.build_error_list # creates and fill up self.basic, self.planning and self.build_error_list
self.render_structure(field=field, key=key, value=value, self.render_structure(field=field, key=key, value=value,
REQUEST=REQUEST, here=here) REQUEST=REQUEST, here=here)
# getting CSS script generator # getting CSS script generator
planning_css_method = getattr(REQUEST['here'],'planning_css') planning_css_method = getattr(REQUEST['here'],'planning_css')
# recover CSS data buy calling DTML document # recover CSS data buy calling DTML document
...@@ -975,7 +973,6 @@ class PlanningBoxWidget(Widget.Widget): ...@@ -975,7 +973,6 @@ class PlanningBoxWidget(Widget.Widget):
""" """
# XXX testing : uncoment to put selection to null => used for debugging # XXX testing : uncoment to put selection to null => used for debugging
#here.portal_selections.setSelectionFor(selection_name, None) #here.portal_selections.setSelectionFor(selection_name, None)
####### DATA DEFINITION ####### ####### DATA DEFINITION #######
self.build_error_list = None self.build_error_list = None
# recovering usefull planning properties # recovering usefull planning properties
...@@ -1194,7 +1191,7 @@ class BasicStructure: ...@@ -1194,7 +1191,7 @@ class BasicStructure:
selection_report_current = () selection_report_current = ()
else: else:
selection_report_current = self.selection.getReportList() selection_report_current = self.selection.getReportList()
# building report_tree_list # building report_tree_list
report_tree_list = makeTreeList(here=self.here, form=self.form, report_tree_list = makeTreeList(here=self.here, form=self.form,
root_dict=None, root_dict=None,
...@@ -1271,7 +1268,7 @@ class BasicStructure: ...@@ -1271,7 +1268,7 @@ class BasicStructure:
# processing all cases # processing all cases
self.selection.edit(params = kw) self.selection.edit(params = kw)
# recovering object list # recovering object list
if self.list_method not in (None,''): if self.list_method not in (None,''):
# valid list_method has been found # valid list_method has been found
...@@ -1713,7 +1710,7 @@ class BasicStructure: ...@@ -1713,7 +1710,7 @@ class BasicStructure:
secondary_axis_stop = group_stop, secondary_axis_stop = group_stop,
property_dict = property_dict) property_dict = property_dict)
if object_list != None: if object_list not in [None, []]:
child_group.setBasicActivities(object_list,self.list_error, child_group.setBasicActivities(object_list,self.list_error,
secondary_axis_bounds) secondary_axis_bounds)
...@@ -1722,7 +1719,7 @@ class BasicStructure: ...@@ -1722,7 +1719,7 @@ class BasicStructure:
except (AttributeError): except (AttributeError):
self.basic_group_list = [] self.basic_group_list = []
self.basic_group_list.append(child_group) self.basic_group_list.append(child_group)
return 1 return 1
...@@ -2491,7 +2488,6 @@ class Activity: ...@@ -2491,7 +2488,6 @@ class Activity:
# passive # passive
block_color = '#D1E8FF' block_color = '#D1E8FF'
block_link = '' block_link = ''
new_block = Bloc(name= block_name,color=block_color,link=block_link, new_block = Bloc(name= block_name,color=block_color,link=block_link,
number = block_number, number = block_number,
calendar_view=self.calendar_view, parent_activity=self, calendar_view=self.calendar_view, parent_activity=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