From 97ddf7a2c48332662e29e841b55f60e11012c60e Mon Sep 17 00:00:00 2001
From: Gaetan Delannay <gaetan.delannay@gmail.com>
Date: Tue, 30 Apr 2013 11:45:31 +0200
Subject: [PATCH] [gen] Bugfix: do not show the Calendar widget (search and
 edit layouts) if field.calendar is False.

---
 gen/mixins/ToolMixin.py |  1 -
 gen/ui/widgets/date.pt  | 24 +++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/gen/mixins/ToolMixin.py b/gen/mixins/ToolMixin.py
index 122c24f..66208b7 100644
--- a/gen/mixins/ToolMixin.py
+++ b/gen/mixins/ToolMixin.py
@@ -373,7 +373,6 @@ class ToolMixin(BaseMixin):
             params['UID'] = getattr(refObject, refField.name).data
         # Use index "Allowed" if noSecurity is False
         if not noSecurity: params['Allowed'] = self.getAllowedValue()
-        print params
         brains = self.getPath("/catalog")(**params)
         if brainsOnly:
             # Return brains only.
diff --git a/gen/ui/widgets/date.pt b/gen/ui/widgets/date.pt
index 30031f4..23515be 100644
--- a/gen/ui/widgets/date.pt
+++ b/gen/ui/widgets/date.pt
@@ -40,9 +40,11 @@
             tal:content="year"></option>
   </select>
   <tal:comment replace="nothing">The icon for displaying the calendar popup</tal:comment>
-  <input type="hidden" tal:attributes="id name; name name"/>
-  <img tal:attributes="id string:${name}_img; src string: $appUrl/ui/calendar.gif"/>
-  <script type="text/javascript" tal:content="python: contextObj.getCalendarInit(name, years)"></script>
+  <tal:calendar condition="widget/calendar">
+   <input type="hidden" tal:attributes="id name; name name"/>
+   <img tal:attributes="id string:${name}_img; src string: $appUrl/ui/calendar.gif"/>
+   <script type="text/javascript" tal:content="python: contextObj.getCalendarInit(name, years)"></script>
+  </tal:calendar> 
 
   <tal:hour condition="python: widget['format'] == 0">
     <select tal:define="hours python:range(0,24);"
@@ -107,9 +109,11 @@
                   tal:content="value" tal:attributes="value value"></option>
         </select>
        <tal:comment replace="nothing">The icon for displaying the calendar popup</tal:comment>
-       <input type="hidden" tal:attributes="id fromName; name fromName"/>
-       <img tal:attributes="id string:${fromName}_img; src string: $appUrl/ui/calendar.gif"/>
-       <script type="text/javascript" tal:content="python: tool.getCalendarInit(fromName, years)"></script>
+       <tal:calendar condition="widget/calendar">
+        <input type="hidden" tal:attributes="id fromName; name fromName"/>
+        <img tal:attributes="id string:${fromName}_img; src string: $appUrl/ui/calendar.gif"/>
+        <script type="text/javascript" tal:content="python: tool.getCalendarInit(fromName, years)"></script>
+       </tal:calendar>
       </td>
     </tr>
     <tal:comment replace="nothing">To</tal:comment>
@@ -138,9 +142,11 @@
                  tal:content="value" tal:attributes="value value"></option>
         </select>
        <tal:comment replace="nothing">The icon for displaying the calendar popup</tal:comment>
-       <input type="hidden" tal:attributes="id toName; name toName"/>
-       <img tal:attributes="id string:${toName}_img; src string: $appUrl/ui/calendar.gif"/>
-       <script type="text/javascript" tal:content="python: tool.getCalendarInit(toName, years)"></script>
+       <tal:calendar condition="widget/calendar">
+        <input type="hidden" tal:attributes="id toName; name toName"/>
+        <img tal:attributes="id string:${toName}_img; src string: $appUrl/ui/calendar.gif"/>
+        <script type="text/javascript" tal:content="python: tool.getCalendarInit(toName, years)"></script>
+       </tal:calendar>
       </td>
     </tr>
   </table>