R-2.9.9

fix web2py.js with show_if and grid

Makefile

@@ -30,7 +30,7 @@ update:
 	echo "remember that pymysql was tweaked"
 src:
 	### Use semantic versioning
-	echo 'Version 2.9.8-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
+	echo 'Version 2.9.9-stable+timestamp.'`date +%Y.%m.%d.%H.%M.%S` > VERSION
 	### rm -f all junk files
 	make clean
 	### clean up baisc apps

VERSION

@@ -1 +1 @@
-Version 2.9.8-stable+timestamp.2014.09.06.23.09.41
+Version 2.9.9-stable+timestamp.2014.09.08.08.12.34

applications/admin/static/js/web2py.js

@@ -545,8 +545,11 @@
       };
       $('[data-show-trigger]', target).each(function () {
         var name = $(this).attr('data-show-trigger');
-        if(!triggers[name]) triggers[name] = [];
+        // The field exists only when creating/editing a row
-        triggers[name].push($(this).attr('id'));
+        if ($('#' + name).length) {
+            if(!triggers[name]) triggers[name] = [];
+            triggers[name].push($(this).attr('id'));
+        }
       });
       for(var name in triggers) {
         $('#' + name, target).change(show_if).keyup(show_if);

applications/examples/static/js/web2py.js

@@ -545,8 +545,11 @@
       };
       $('[data-show-trigger]', target).each(function () {
         var name = $(this).attr('data-show-trigger');
-        if(!triggers[name]) triggers[name] = [];
+        // The field exists only when creating/editing a row
-        triggers[name].push($(this).attr('id'));
+        if ($('#' + name).length) {
+            if(!triggers[name]) triggers[name] = [];
+            triggers[name].push($(this).attr('id'));
+        }
       });
       for(var name in triggers) {
         $('#' + name, target).change(show_if).keyup(show_if);

applications/welcome/static/js/web2py.js

@@ -545,8 +545,11 @@
       };
       $('[data-show-trigger]', target).each(function () {
         var name = $(this).attr('data-show-trigger');
-        if(!triggers[name]) triggers[name] = [];
+        // The field exists only when creating/editing a row
-        triggers[name].push($(this).attr('id'));
+        if ($('#' + name).length) {
+            if(!triggers[name]) triggers[name] = [];
+            triggers[name].push($(this).attr('id'));
+        }
       });
       for(var name in triggers) {
         $('#' + name, target).change(show_if).keyup(show_if);

gluon/storage.py

@@ -13,6 +13,7 @@ Provides:
 """
 
 import cPickle
+import copy_reg
 import gluon.portalocker as portalocker
 
 __all__ = ['List', 'Storage', 'Settings', 'Messages',
@@ -129,6 +130,12 @@ class Storage(dict):
         values = self.getlist(key)
         return values[-1] if values else default
 
+
+def pickle_storage(s):
+    return Storage, (dict(s),)
+
+copy_reg.pickle(Storage, pickle_storage)
+
 PICKABLE = (str, int, long, float, bool, list, dict, tuple, set)
 
 

gluon/tools.py

@@ -2710,7 +2710,8 @@ class Auth(object):
             extra_fields = [
                 Field("password_two", "password", requires=IS_EQUAL_TO(
                         request.post_vars.get(passfield,None),
-                        error_message=self.messages.mismatched_password))]
+                        error_message=self.messages.mismatched_password),
+                        label=current.T("Confirm Password"))]
         else:
             extra_fields = []
         form = SQLFORM(table_user,