moved POST api to the api.py controller + rename dashboard to document

pboard/pboard/controllers/api.py

@@ -39,7 +39,7 @@ class PODApiController(BaseController):
         loNewNode.data_reminder_datetime = data_reminder_datetime
 
       pm.DBSession.flush()
-      redirect(lurl('/dashboard?node=%i'%(loNewNode.parent_id)))
+      redirect(lurl('/document/%i'%(loNewNode.parent_id)))
 
     @expose()
     def set_parent_node(self, node_id, new_parent_id, **kw):
@@ -47,6 +47,56 @@ class PODApiController(BaseController):
       if new_parent_id!='':
         loNewNode.parent_id = int(new_parent_id)
       pm.DBSession.flush()
-      redirect(lurl('/dashboard?node=%s'%(node_id)))
+      redirect(lurl('/document/%s'%(node_id)))
 
+    @expose()
+    def move_node_upper(self, node_id=0, came_from=lurl('/dashboard')):
+      loNode = pld.getNode(node_id)
+      pld.moveNodeUpper(loNode)
+      redirect(came_from)
+
+    @expose()
+    def move_node_lower(self, node_id=0, came_from=lurl('/dashboard')):
+      loNode = pld.getNode(node_id)
+      pld.moveNodeLower(loNode)
+      redirect(came_from)
+
+    @expose()
+    def create_document(self, parent_id=None):
+      loNewNode = pld.createNode()
+      loNewNode.data_label   = 'New document'
+      loNewNode.data_content = 'insert content...'
+      if int(parent_id)==0:
+        loNewNode.parent_id = None
+      else:
+        loNewNode.parent_id = parent_id
+
+      DBSession.flush()
+      redirect(lurl('/document/%i'%(loNewNode.node_id)))
+
+    @expose()
+    def edit_label(self, node_id, data_label):
+      loNewNode = pld.getNode(node_id)
+      loNewNode.data_label   = data_label
+      redirect(lurl('/document/%s'%(node_id)))
+
+    @expose()
+    def edit_status(self, node_id, node_status):
+      loNewNode = pld.getNode(node_id)
+      loNewNode.node_status = node_status
+      redirect(lurl('/document/%s'%(node_id)))
+
+    @expose()
+    def edit_content(self, node_id, data_content, **kw):
+      loNewNode = pld.getNode(node_id)
+      loNewNode.data_content = data_content
+      redirect(lurl('/document/%s'%(node_id)))
+
+    @expose()
+    def force_delete_node(self, node_id=None):
+      loNode     = pld.getNode(node_id)
+      liParentId = loNode.parent_id
+      if loNode.getChildNb()<=0:
+        DBSession.delete(loNode)
+      redirect(lurl('/document/%i'%(liParentId or 0)))
 

pboard/pboard/controllers/root.py

@@ -118,68 +118,15 @@ class RootController(BaseController):
         flash(_('We hope to see you soon!'))
         redirect(came_from)
         
-    @expose('pboard.templates.dashboard')
-    def dashboard(self, node=0, came_from=lurl('/')):
+    @expose('pboard.templates.document')
+    def document(self, node=0, came_from=lurl('/')):
         """show the user dashboard"""
         import pboard.model.data as pbmd
         loRootNodeList = pbm.DBSession.query(pbmd.PBNode).filter(pbmd.PBNode.parent_id==None).order_by(pbmd.PBNode.node_order).all()
-        liNodeId = max(int(node), 1)
-        print "{{{{{{{{{{{{{{{{{{{{}}}}}}}}}}}}}}}}}}}}", liNodeId
-        # liNodeId = 5
+        liNodeId         = max(int(node), 1) # show node #1 if no selected node
         loCurrentNode    = pbm.DBSession.query(pbmd.PBNode).filter(pbmd.PBNode.node_id==liNodeId).one()
         loNodeStatusList = pbmd.PBNodeStatus.getList()
         return dict(root_node_list=loRootNodeList, current_node=loCurrentNode, node_status_list = loNodeStatusList)
 
-    @expose()
-    def move_node_upper(self, node_id=0, came_from=lurl('/dashboard')):
-      loNode = pld.getNode(node_id)
-      pld.moveNodeUpper(loNode)
-      redirect(came_from)
-
-    @expose()
-    def move_node_lower(self, node_id=0, came_from=lurl('/dashboard')):
-      loNode = pld.getNode(node_id)
-      pld.moveNodeLower(loNode)
-      redirect(came_from)
-
-    @expose()
-    def create_document(self, parent_id=None):
-      loNewNode = pld.createNode()
-      loNewNode.data_label   = 'New document'
-      loNewNode.data_content = 'insert content...'
-      if int(parent_id)==0:
-        loNewNode.parent_id = None
-      else:
-        loNewNode.parent_id = parent_id
-
-      DBSession.flush()
-      redirect(lurl('/dashboard?node=%i'%(loNewNode.node_id)))
-
-    @expose()
-    def edit_label(self, node_id, data_label):
-      loNewNode = pld.getNode(node_id)
-      loNewNode.data_label   = data_label
-      redirect(lurl('/dashboard?node=%s'%(node_id)))
-
-    @expose()
-    def edit_status(self, node_id, node_status):
-      loNewNode = pld.getNode(node_id)
-      loNewNode.node_status = node_status
-      redirect(lurl('/dashboard?node=%s'%(node_id)))
-
-    @expose()
-    def edit_content(self, node_id, data_content, **kw):
-      loNewNode = pld.getNode(node_id)
-      loNewNode.data_content = data_content
-      redirect(lurl('/dashboard?node=%s'%(node_id)))
-
-    @expose()
-    def force_delete_node(self, node_id=None):
-      loNode     = pld.getNode(node_id)
-      liParentId = loNode.parent_id
-      if loNode.getChildNb()<=0:
-        DBSession.delete(loNode)
-      redirect(lurl('/dashboard?node=%i'%(liParentId or 0)))
-
 
 

pboard/pboard/model/data.py

@@ -1,5 +1,14 @@
 # -*- coding: utf-8 -*-
 """
+
+Search activity on the dashboard:
+select node_id, node_type, created_at as last_action, data_label, 'new data' as label from pb_nodes where updated_at=created_at
+union
+select node_id, node_type, updated_at as last_action, data_label, 'updated data' as label from pb_nodes where updated_at>created_at
+union
+select node_id, node_type, data_datetime as last_action, data_label, 'event' as label from pb_nodes where node_type='event'
+order by last_action desc
+
 """
 import os
 import re

pboard/pboard/templates/dashboard.mak → pboard/pboard/templates/document.mak

@@ -4,7 +4,7 @@
 
 <%def name="node_treeview_for_set_parent_menu(node_id, node_list, indentation=-1)">
   % if indentation==-1:
-    <li><a href="${tg.url('/api/set_parent_node?node_id=%i&new_parent_id=0'%(current_node.node_id))}">${_('Root')}</a>
+    <li><a href="${tg.url('/api/set_parent_node?node_id=%i&new_parent_id=0'%(current_node.node_id))}">${_('Home')}</a>
       ${node_treeview_for_set_parent_menu(node_id, node_list, 0)}
     </li>
   % else:
@@ -29,7 +29,7 @@
         ${_('Root')}
       </a>
       <div class="pod-toolbar">
-        <a href="${tg.url('/create_document?parent_id=0')}" title="${_('Add child document')}"><i class="icon-g-circle-plus"></i></a>
+        <a href="${tg.url('/api/create_document?parent_id=0')}" title="${_('Add child document')}"><i class="icon-g-circle-plus"></i></a>
       </div>
     </div>
     ${node_treeview(node_list, 0)}
@@ -47,9 +47,9 @@
             % endif
           </a>
           <div class="pod-toolbar">
-            <a href="${tg.url('/move_node_upper?node_id=%i'%(node.node_id))}" title="${_('Move up')}"><i class="icon-g-up-arrow"></i></a>
-            <a href="${tg.url('/move_node_lower?node_id=%i'%(node.node_id))}" title="${_('Move down')}"><i class="icon-g-down-arrow"></i></a>
-            <a href="${tg.url('/create_document?parent_id=%i'%(node.node_id))}" title="${_('Add child document')}"><i class="icon-g-circle-plus"></i></a>
+            <a href="${tg.url('/api/move_node_upper?node_id=%i'%(node.node_id))}" title="${_('Move up')}"><i class="icon-g-up-arrow"></i></a>
+            <a href="${tg.url('/api/move_node_lower?node_id=%i'%(node.node_id))}" title="${_('Move down')}"><i class="icon-g-down-arrow"></i></a>
+            <a href="${tg.url('/api/create_document?parent_id=%i'%(node.node_id))}" title="${_('Add child document')}"><i class="icon-g-circle-plus"></i></a>
           </div>
           <div class="pod-status ${node.getStatus().css}" title='${node.getStatus().label}'>
              <i class='${node.getStatus().icon}'></i>
@@ -129,12 +129,12 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
         </ul>
 
 
-        <a href='${tg.url('/force_delete_node?node_id=%i'%(current_node.node_id))}' id='current-document-force-delete-button' class="btn" onclick="return confirm('${_('Delete current document?')}');"><i class="icon-g-remove"></i> ${_('Delete')}</a>
+        <a href='${tg.url('/api/force_delete_node?node_id=%i'%(current_node.node_id))}' id='current-document-force-delete-button' class="btn" onclick="return confirm('${_('Delete current document?')}');"><i class="icon-g-remove"></i> ${_('Delete')}</a>
       </div>
       
             <!--</div> PAGE HEADER -->
       <h3 id="current-document-title">#${current_node.node_id} - ${current_node.data_label}</h3>
-        <form style='display: none; margin-top: 1em;' id="current-document-title-edit-form" method='post' action='${tg.url('/edit_label')}'>
+        <form style='display: none; margin-top: 1em;' id="current-document-title-edit-form" method='post' action='${tg.url('/api/edit_label')}'>
           <div class="input-prepend input-append">
             <input type='hidden' name='node_id' value='${current_node.node_id}'/>
             ${POD.CancelButton('current-document-title-edit-cancel-button')}
@@ -148,7 +148,7 @@ POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
         <div id='current-document-content' class="">
           ${current_node.getContentWithTags()|n}
         </div>
-        <form style='display: none;' id="current-document-content-edit-form" method='post' action='${tg.url('/edit_content')}'>
+        <form style='display: none;' id="current-document-content-edit-form" method='post' action='${tg.url('/api/edit_content')}'>
           <input type='hidden' name='node_id' value='${current_node.node_id}'/>
           <textarea id="current_node_textarea" name='data_content' spellcheck="false" wrap="off" autofocus placeholder="Enter something ...">
             ${current_node.data_content|n}