From 383af4a687fccbd637d0530c86bfdaaab0027266 Mon Sep 17 00:00:00 2001
From: Gaetan Delannay <gaetan.delannay@gmail.com>
Date: Wed, 11 Sep 2013 22:11:44 +0200
Subject: [PATCH] [gen] BPX bugfixes.

---
 fields/boolean.py        |  2 +-
 fields/date.py           | 12 ++++++------
 fields/ref.py            |  4 ++--
 gen/ui/appy.js           | 12 ++++++++++++
 gen/wrappers/__init__.py | 11 +----------
 5 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/fields/boolean.py b/fields/boolean.py
index dbc91c3..e85958e 100644
--- a/fields/boolean.py
+++ b/fields/boolean.py
@@ -36,7 +36,7 @@ class Boolean(Field):
              onclick=":'toggleCheckbox(%s, %s); updateSlaves(this)' % \
                        (q(name), q('%s_hidden' % name))"/>
       <input type="hidden" name=":name" id=":'%s_hidden' % name"
-             value=":isChecked and 'True' or 'False')"/>
+             value=":isChecked and 'True' or 'False'"/>
      </x>''')
 
     pxSearch = Px('''
diff --git a/fields/date.py b/fields/date.py
index 4b0ca1a..b09db01 100644
--- a/fields/date.py
+++ b/fields/date.py
@@ -31,8 +31,8 @@ class Date(Field):
        <option value="">-</option>
        <option for="day in days"
                var2="zDay=str(day).zfill(2)" value=":zDay"
-               selected="field.isSelected(zobj, 'day', day, \
-                                          rawValue)">:zDay</option>
+               selected=":field.isSelected(zobj, 'day', day, \
+                                           rawValue)">:zDay</option>
       </select>
 
       <!-- Month -->
@@ -41,16 +41,16 @@ class Date(Field):
        <option value="">-</option>
        <option for="month in months"
                var2="zMonth=str(month).zfill(2)" value=":zMonth"
-               selected="field.isSelected(zobj, 'month', month, \
-                                          rawValue)">:zMonth</option>
+               selected=":field.isSelected(zobj, 'month', month, \
+                                           rawValue)">:zMonth</option>
       </select>
 
       <!-- Year -->
       <select name=":'%s_year' % name" id=":'%s_year' % name">
        <option value="">-</option>
        <option for="year in years" value=":year"
-               selected="field.isSelected(zobj, name, 'year', year, \
-                                          rawValue)">:year</option>
+               selected=":field.isSelected(zobj, name, 'year', year, \
+                                           rawValue)">:year</option>
       </select>
 
       <!-- The icon for displaying the calendar popup -->
diff --git a/fields/ref.py b/fields/ref.py
index 0654d1b..c09d619 100644
--- a/fields/ref.py
+++ b/fields/ref.py
@@ -246,8 +246,8 @@ class Ref(Field):
                    uids=[o.UID() for o in \
                          field.getLinkedObjects(zobj).objects];
                    isBeingCreated=zobj.isTemporary()"
-             name=":name" size="isMultiple and field.height or ''"
-             multiple="isMultiple and 'multiple' or ''">
+             name=":name" size=":isMultiple and field.height or ''"
+             multiple=":isMultiple">
       <option value="" if="not isMultiple">:_('choose_a_value')</option>
       <option for="ztied in zobjects" var2="uid=ztied.o.UID()"
               selected=":inRequest and (uid in requestValue) or \
diff --git a/gen/ui/appy.js b/gen/ui/appy.js
index 08dadd9..8376a6c 100644
--- a/gen/ui/appy.js
+++ b/gen/ui/appy.js
@@ -483,6 +483,18 @@ function generatePodDocument(contextUid, fieldName, podFormat, queryData,
   }
   theForm.submit();
 }
+
+function protectAppyForm() {
+  window.onbeforeunload = function(e){
+    theForm = document.getElementById("appyForm");
+    if (theForm.button.value == "") {
+      var e = e || window.event;
+      if (e) {e.returnValue = warn_leave_form;}
+      return warn_leave_form;
+    }
+  }
+}
+
 // Functions for opening and closing a popup
 function openPopup(popupId, msg) {
   // Put the message into the popup
diff --git a/gen/wrappers/__init__.py b/gen/wrappers/__init__.py
index fe0c85b..bc6582b 100644
--- a/gen/wrappers/__init__.py
+++ b/gen/wrappers/__init__.py
@@ -562,16 +562,7 @@ class AbstractWrapper(object):
              groupedFields=zobj.getGroupedFields(layoutType,page, cssJs=cssJs)">
       <x>:tool.pxPagePrologue</x>
       <!-- Warn the user that the form should be left via buttons -->
-      <script type="text/javascript"><![CDATA[
-       window.onbeforeunload = function(e){
-         theForm = document.getElementById('appyForm');
-         if (theForm.button.value == "") {
-           var e = e || window.event;
-           if (e) {e.returnValue = warn_leave_form;}
-           return warn_leave_form;
-         }
-       }]]>
-      </script>
+      <script type="text/javascript">protectAppyForm()</script>
       <form id="appyForm" name="appyForm" method="post"
             enctype="multipart/form-data" action=":zobj.absolute_url()+'/do'">
        <input type="hidden" name="action" value="Update"/>