Merge pull request #1 from web2py/master

web2py origin changes

applications/welcome/views/layout.html

@@ -35,12 +35,12 @@
   <body>
     <div class="w2p_flash alert alert-dismissable">{{=response.flash or ''}}</div>
     <!-- Navbar ======================================= -->
-   <nav class="navbar navbar-light navbar-expand-md bg-faded justify-content-center">
+    <nav class="navbar navbar-light navbar-expand-md bg-faded justify-content-center">
        <a href="http://web2py.com" class="navbar-brand d-flex w-50 mr-auto">web2py</a>
-      <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
+       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
-        <span class="navbar-toggler-icon"></span>
+         <span class="navbar-toggler-icon"></span>
-      </button>
+       </button>
-      <div class="navbar-collapse collapse w-100" id="navbarNavDropdown">
+       <div class="navbar-collapse collapse w-100" id="navbarNavDropdown">
          <ul class="navbar-nav w-100 justify-content-center">
           {{for _item in response.menu or []:}}
           {{if len(_item)<4 or not _item[3]:}}

gluon/sqlhtml.py

@@ -19,7 +19,7 @@ import re
 import copy
 
 import os
-from gluon._compat import StringIO, unichr, urllib_quote, iteritems, basestring, long, unicodeT, to_native, to_unicode, urlencode
+from gluon._compat import StringIO, unichr, urllib_quote, iteritems, basestring, long, integer_types, unicodeT, to_native, to_unicode, urlencode
 from gluon.http import HTTP, redirect
 from gluon.html import XmlComponent, truncate_string
 from gluon.html import XML, SPAN, TAG, A, DIV, CAT, UL, LI, TEXTAREA, BR, IMG
@@ -103,11 +103,11 @@ class CacheRepresenter(object):
                 cache[field][value] = nvalue
         return nvalue
 
-def safe_int(x):
+def safe_int(x, i=0):
     try:
         return int(x)
     except ValueError:
-        return 0
+        return i
 
 
 def safe_float(x):
@@ -1382,7 +1382,6 @@ class SQLFORM(FORM):
 
         self.field_parent = {}
         xfields = []
-        self.fields = fields
         self.custom = Storage()
         self.custom.dspval = Storage()
         self.custom.inpval = Storage()
@@ -1669,12 +1668,12 @@ class SQLFORM(FORM):
 
         """
         Similar to `FORM.accepts` but also does insert, update or delete in DAL.
-        If detect_record_change is `True` than:
+        If detect_record_change is `True` then:
 
           - `form.record_changed = False` (record is properly validated/submitted)
           - `form.record_changed = True` (record cannot be submitted because changed)
 
-        If detect_record_change == False than:
+        If detect_record_change == False then:
 
           - `form.record_changed = None`
         """
@@ -2028,7 +2027,7 @@ class SQLFORM(FORM):
 
         table_name = attributes.get('table_name', 'no_table')
 
-        # So it won't interfere with SQLDB.define_table
+        # So it won't interfere with DAL.define_table
         if 'table_name' in attributes:
             del attributes['table_name']
 
@@ -2363,7 +2362,7 @@ class SQLFORM(FORM):
                     nrows = dbset.db._adapter.count(dbset.query, limit=1000)
                 else:
                     nrows = dbset.count(cache=cache_count)
-            elif isinstance(cache_count, (int, long)):
+            elif isinstance(cache_count, integer_types):
                     nrows = cache_count
             elif callable(cache_count):
                 nrows = cache_count(dbset, request.vars)
@@ -2851,19 +2850,13 @@ class SQLFORM(FORM):
         head = TR(*headcols, **dict(_class=ui.get('header')))
 
         cursor = True
-        # figure out what page we are one to setup the limitby
+        # figure out what page we are on to setup the limitby
         if paginate and dbset._db._adapter.dbengine == 'google:datastore' and use_cursor:
             cursor = request.vars.cursor or True
             limitby = (0, paginate)
-            try:
+            page = safe_int(request.vars.page, 1) - 1
-                page = int(request.vars.page or 1) - 1
-            except ValueError:
-                page = 0
         elif paginate and paginate < nrows:
-            try:
+            page = safe_int(request.vars.page, 1) - 1
-                page = int(request.vars.page or 1) - 1
-            except ValueError:
-                page = 0
             limitby = (paginate * page, paginate * (page + 1))
         else:
             limitby = None
@@ -2905,10 +2898,7 @@ class SQLFORM(FORM):
         paginator = UL()
         if paginate and dbset._db._adapter.dbengine == 'google:datastore' and use_cursor:
             # this means we may have a large table with an unknown number of rows.
-            try:
+            page = safe_int(request.vars.page, 1) - 1
-                page = int(request.vars.page or 1) - 1
-            except ValueError:
-                page = 0
             paginator.append(LI('page %s' % (page + 1)))
             if next_cursor:
                 d = dict(page=page + 2, cursor=next_cursor)
@@ -2927,10 +2917,7 @@ class SQLFORM(FORM):
             npages, reminder = divmod(nrows, paginate)
             if reminder:
                 npages += 1
-            try:
+            page = safe_int(request.vars.page, 1) - 1
-                page = int(request.vars.page or 1) - 1
-            except ValueError:
-                page = 0
 
             def self_link(name, p):
                 d = dict(page=p + 1)
@@ -3289,7 +3276,7 @@ class SQLFORM(FORM):
             links = links.get(table._tablename, [])
         for key in ('fields', 'field_id', 'left', 'headers', 'orderby', 'groupby', 'searchable',
                     'sortable', 'paginate', 'deletable', 'editable', 'details', 'selectable',
-                    'create', 'csv', 'links', 'links_in_grid', 'upload', 'maxtextlengths',
+                    'create', 'csv', 'upload', 'maxtextlengths',
                     'maxtextlength', 'onvalidation', 'onfailure', 'oncreate', 'onupdate',
                     'ondelete', 'sorter_icons', 'ui', 'showbuttontext', '_class', 'formname',
                     'search_widget', 'advanced_search', 'ignore_rw', 'formstyle', 'exportclasses',

gluon/tests/test_sqlhtml.py

@@ -47,6 +47,8 @@ class Test_safe_int(unittest.TestCase):
         self.assertEqual(safe_int(1), 1)
         # not safe int
         self.assertEqual(safe_int('1x'), 0)
+        # not safe int (alternate default)
+        self.assertEqual(safe_int('1x', 1), 1)
 
 
 # class Test_safe_float(unittest.TestCase):

gluon/validators.py

@@ -670,7 +670,7 @@ class IS_IN_DB(Validator):
                 try:
                     value = int(value)
                 except TypeError:
-                    return (values, translate(self.error_message))
+                    return (value, translate(self.error_message))
 
             if self.theset:
                 if str(value) in self.theset: