Merge pull request #539 from ilvalle/master

table callbacks panel in admin editor

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

@@ -14,5 +14,4 @@
         {{=shortcut('Tab', T('Expand Abbreviation (html files only)'))}}
         {{=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