Merge branch 'master' of https://github.com/web2py/web2py

applications/admin/controllers/appadmin.py

@@ -693,6 +693,6 @@ def hooks():
         ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
         for op in t['method_hooks']:
             ul_t.append(LI (op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _href=f['url']if 'url' in f else None)) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main

applications/admin/views/default/edit.html

@@ -264,6 +264,10 @@ $(document).on('click', 'a.font_button', function (e) {
         <div id="window_shortcuts" class="tab-pane container-fluid">
             {{include 'default/editor_shortcuts.html'}}
         </div>
+        <div id="window_dbhooks" class="tab-pane container-fluid">
+            <h4>Tables hooks</h4>
+            <div>{{=LOAD(url="/%s/appadmin/hooks" % app, ajax=True, timeout=60000, times="infinity")}}</div>
+        </div>
     </section>
 </div>
 {{block footer}}
@@ -272,6 +276,7 @@ $(document).on('click', 'a.font_button', function (e) {
 <ul id="windows_hooks" class="nav">
     <li class=""><a href="#window_todo">TODO</a></li>
     <li class=""><a href="#window_shortcuts">Shortcuts</a></li>
+    <li class=""><a href="#window_dbhooks">Hooks</a></li>
 </ul>
 </div>
 </div>

applications/admin/views/default/editor_shortcuts.html

@@ -15,4 +15,3 @@
         {{=shortcut('Ctrl-Space', T('Autocomplete Python Code'))}}
     </ul>
 </div>
-</div>

applications/examples/controllers/appadmin.py

@@ -461,15 +461,9 @@ def ccache():
                 if value[0] < ram['oldest']:
                     ram['oldest'] = value[0]
                 ram['keys'].append((key, GetInHMS(time.time() - value[0])))
-        folder = os.path.join(request.folder,'cache')
+
-        if not os.path.exists(folder):
+        for key in cache.disk.storage:
-            os.mkdir(folder)
+            value = cache.disk.storage[key]
-        locker = open(os.path.join(folder, 'cache.lock'), 'a')
-        portalocker.lock(locker, portalocker.LOCK_EX)
-        disk_storage = shelve.open(
-            os.path.join(folder, 'cache.shelve'))
-        try:
-            for key, value in disk_storage.items():
             if isinstance(value, dict):
                 disk['hits'] = value['hit_total'] - value['misses']
                 disk['misses'] = value['misses']
@@ -485,10 +479,6 @@ def ccache():
                 if value[0] < disk['oldest']:
                     disk['oldest'] = value[0]
                 disk['keys'].append((key, GetInHMS(time.time() - value[0])))
-        finally:
-            portalocker.unlock(locker)
-            locker.close()
-            disk_storage.close()
 
         total['entries'] = ram['entries'] + disk['entries']
         total['bytes'] = ram['bytes'] + disk['bytes']
@@ -703,6 +693,6 @@ def hooks():
         ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
         for op in t['method_hooks']:
             ul_t.append(LI (op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _href=f['url']if 'url' in f else None)) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main

applications/welcome/controllers/appadmin.py

@@ -693,6 +693,6 @@ def hooks():
         ul_t = UL(_class='nav nav-list', _id="a_%s" % t['slug'], _style='display:none')
         for op in t['method_hooks']:
             ul_t.append(LI (op['name']))
-            ul_t.append(UL([LI(A(f['funcname'], _href=f['url']if 'url' in f else None)) for f in op['functions']]))
+            ul_t.append(UL([LI(A(f['funcname'], _class="editor_filelink", _href=f['url']if 'url' in f else None, **{'_data-lineno':f['lineno']-1})) for f in op['functions']]))
         ul_main.append(ul_t)
     return ul_main

gluon/contrib/hypermedia.py

@@ -276,6 +276,8 @@ class Collection(object):
             table = db[tablename]
             if 'json' in request.env.content_type:
                 data = request.post_vars.data
+            else:
+                data = request.post_vars
             if request.get_vars or len(request.args)>1: # update
                 # ADD validate fields and return error
                 try:

gluon/dal/adapters/oracle.py

@@ -136,7 +136,7 @@ class OracleAdapter(BaseAdapter):
         return self.log_execute(command, args)
 
     def create_sequence_and_triggers(self, query, table, **args):
-        tablename = table._tablename
+        tablename = table._rname or table._tablename
         id_name = table._id.name
         sequence_name = table._sequence_name
         trigger_name = table._trigger_name

gluon/sqlhtml.py

@@ -1204,6 +1204,13 @@ class SQLFORM(FORM):
                         field, default, _disabled=True)
                 else:
                     inp = field.formatter(default)
+                if getattr(field, 'show_if', None):
+                    if not isinstance(inp, DIV):
+                        # Create a container for string represents
+                        inp = DIV(inp, _id='%s_%s' % (field.tablename, field.name))
+                    trigger, cond = show_if(field.show_if)
+                    inp['_data-show-trigger'] = trigger
+                    inp['_data-show-if'] = cond
             elif field.type == 'upload':
                 if field.widget:
                     inp = field.widget(field, default, upload)

gluon/tools.py

@@ -1544,7 +1544,9 @@ class Auth(object):
                                            _href=item['href'])))
             self.bar.insert(-1, LI('', _class='divider'))
             if self.user_id:
-                self.bar = LI(Anr(prefix, user_identifier, _href='#'),
+                self.bar = LI(Anr(prefix, user_identifier,
+                                  _href='#',_class="dropdown-toggle",
+                                  data={'toggle':'dropdown'}),
                               self.bar,_class='dropdown')
             else:
                 self.bar = LI(Anr(T('Log In'),