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

@@ -258,12 +258,16 @@ $(document).on('click', 'a.font_button', function (e) {
         </div>
     </div>
     <section id="windows_divs" class="tab-content  ">
-    <div id="window_todo" class="tab-pane container-fluid">
-        {{=LOAD('default', 'todolist.load', vars={'app':app}, ajax=True, timeout=60000, times="infinity")}}
-    </div>
-    <div id="window_shortcuts" class="tab-pane container-fluid">
-        {{include 'default/editor_shortcuts.html'}}
-    </div>
+        <div id="window_todo" class="tab-pane container-fluid">
+            {{=LOAD('default', 'todolist.load', vars={'app':app}, ajax=True, timeout=60000, times="infinity")}}
+        </div>
+        <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

@@ -1,18 +1,17 @@
 <div>
     <h4>{{=T("Keyboard shortcuts")}}</h4>
-        <ul class="keybindings unstyled">
-        <li></li>
-            {{=shortcut('Ctrl+S', T('Save via Ajax'))}}
-            {{=shortcut('Ctrl+F11', T('Toggle Fullscreen'))}}
-			{{=shortcut('Shift+Esc', T('Exit Fullscreen'))}}
-            {{=shortcut('Ctrl-F / Cmd-F', T('Start searching'))}}
-            {{=shortcut('Ctrl-G / Cmd-G', T('Find Next'))}}
-            {{=shortcut('Shift-Ctrl-G / Shift-Cmd-G', T('Find Previous'))}}
-            {{=shortcut('Shift-Ctrl-F / Cmd-Option-F', T('Replace'))}}
-            {{=shortcut('Shift-Ctrl-R / Shift-Cmd-Option-F', T('Replace All'))}}
-            {{=shortcut('Ctrl-/ ', T('Toggle comment'))}}
-            {{=shortcut('Tab', T('Expand Abbreviation (html files only)'))}}
-            {{=shortcut('Ctrl-Space', T('Autocomplete Python Code'))}}
-        </ul>
-    </div>
+    <ul class="keybindings unstyled">
+    <li></li>
+        {{=shortcut('Ctrl+S', T('Save via Ajax'))}}
+        {{=shortcut('Ctrl+F11', T('Toggle Fullscreen'))}}
+		{{=shortcut('Shift+Esc', T('Exit Fullscreen'))}}
+        {{=shortcut('Ctrl-F / Cmd-F', T('Start searching'))}}
+        {{=shortcut('Ctrl-G / Cmd-G', T('Find Next'))}}
+        {{=shortcut('Shift-Ctrl-G / Shift-Cmd-G', T('Find Previous'))}}
+        {{=shortcut('Shift-Ctrl-F / Cmd-Option-F', T('Replace'))}}
+        {{=shortcut('Shift-Ctrl-R / Shift-Cmd-Option-F', T('Replace All'))}}
+        {{=shortcut('Ctrl-/ ', T('Toggle comment'))}}
+        {{=shortcut('Tab', T('Expand Abbreviation (html files only)'))}}
+        {{=shortcut('Ctrl-Space', T('Autocomplete Python Code'))}}
+    </ul>
 </div>

applications/examples/controllers/appadmin.py

@@ -461,34 +461,24 @@ 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):
-            os.mkdir(folder)
-        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']
-                    try:
-                        disk['ratio'] = disk['hits'] * 100 / value['hit_total']
-                    except (KeyError, ZeroDivisionError):
-                        disk['ratio'] = 0
-                else:
-                    if hp:
-                        disk['bytes'] += hp.iso(value[1]).size
-                        disk['objects'] += hp.iso(value[1]).count
-                    disk['entries'] += 1
-                    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()
+
+        for key in cache.disk.storage:
+            value = cache.disk.storage[key]
+            if isinstance(value, dict):
+                disk['hits'] = value['hit_total'] - value['misses']
+                disk['misses'] = value['misses']
+                try:
+                    disk['ratio'] = disk['hits'] * 100 / value['hit_total']
+                except (KeyError, ZeroDivisionError):
+                    disk['ratio'] = 0
+            else:
+                if hp:
+                    disk['bytes'] += hp.iso(value[1]).size
+                    disk['objects'] += hp.iso(value[1]).count
+                disk['entries'] += 1
+                if value[0] < disk['oldest']:
+                    disk['oldest'] = value[0]
+                disk['keys'].append((key, GetInHMS(time.time() - value[0])))
 
         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