implement smaller left panel tree

pboard/pboard/controllers/root.py

@@ -121,7 +121,8 @@ class RootController(BaseController):
         loCurrentUser   = pld.PODStaticController.getCurrentUser()
         loApiController = pld.PODUserFilteredApiController(loCurrentUser.user_id)
 
-        loRootNodeList = loApiController.buildTreeListForMenu(pbmd.PBNodeStatus.getVisibleIdsList())
+        llAccessibleNodes = loApiController.getListOfAllowedNodes()
+
         liNodeId         = int(node_id)
         liVersionId      = int(version)
 
@@ -141,9 +142,12 @@ class RootController(BaseController):
 
         # FIXME - D.A - 2013-11-07 - Currently, the code build a new item if no item found for current user
         # the correct behavior should be to redirect to setup page
+        loMenuItems = loApiController.buildTreeListForMenu(loCurrentNode, pbmd.PBNodeStatus.getVisibleIdsList(), llAccessibleNodes)
+        nodes_as_tree_for_select_field = loApiController.DIRTY_OLDbuildTreeListForMenu(pbmd.PBNodeStatus.getVisibleIdsList())
 
         return dict(
-            root_node_list=loRootNodeList,
+            menu_node_list=loMenuItems,
+            root_node_list_for_select_field=nodes_as_tree_for_select_field,
             current_node=loCurrentNode,
             node_status_list = loNodeStatusList,
             keywords = highlight,

pboard/pboard/lib/dbapi.py

@@ -19,6 +19,7 @@ import pboard.model as pbm
 import tg
 
 FIXME_ERROR_CODE=-1
+
 class PODStaticController(object):
 
   @classmethod
@@ -144,6 +145,30 @@ class PODUserFilteredApiController(object):
     return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).order_by(pbmd.PBNode.updated_at.desc()).limit(piMaxNodeNb).all()
 
 
+  def getListOfAllowedNodes(self) -> pbmd.PBNode:
+    lsSqlQuery = """
+        SELECT
+            pgn.node_id
+        FROM
+            pod_group_node AS pgn
+            join pod_user_group AS pug ON pug.group_id = pgn.group_id
+        WHERE
+            pgn.rights > 0
+            AND pug.user_id = :owner_id
+        UNION
+            SELECT
+                node_id
+            FROM
+                pod_nodes
+            WHERE
+            owner_id=:owner_id;
+    """
+
+    loNodeListResult = DBSession.query(pbmd.PBNode).from_statement(lsSqlQuery).params(owner_id=self._iCurrentUserId)
+
+    return loNodeListResult.all()
+
+
   def searchNodesByText(self, plKeywordList: [str], piMaxNodeNb=100):
     """
     Returns a list of nodes order by type, nodes which contain at least one of the keywords
@@ -171,7 +196,53 @@ class PODUserFilteredApiController(object):
     return DBSession.query(pbmd.PBNode).options(joinedload_all("_lAllChildren")).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).filter(pbmd.PBNode.node_status==psNodeStatus).order_by(pbmd.PBNode.updated_at).limit(piMaxNodeNb).all()
 
 
-  def buildTreeListForMenu(self, plViewableStatusId):
+  def buildTreeListForMenu(self, poCurrentNode: pbmd.PBNode, plViewableStatusId: [], plAllowedNodes: [pbmd.PBNode]) -> [pbmd.NodeTreeItem]:
+    # The algorithm is:
+    # 1. build an intermediate tree containing only current node and parent path
+    #    + complete it with sibling at each level (except root)
+    # 2. add sibling nodes at root level
+    # 3. complete it with shared documents (which are not at root but shared with current user)
+
+    node_tree = []
+
+    previous_tree_item = None
+    tmp_children_nodes = []
+
+    if poCurrentNode is not None:
+        breadcrumb_nodes = poCurrentNode.getBreadCrumbNodes()
+        breadcrumb_nodes.append(poCurrentNode) # by default the current node is not included
+
+        for breadcrumb_node in reversed(breadcrumb_nodes):
+            if previous_tree_item is None:
+                # First iteration. We add all current_node children
+                for child_node in breadcrumb_node.getChildren():
+                    child_item = pbmd.NodeTreeItem(child_node, [])
+                    tmp_children_nodes.append(child_item)
+                previous_tree_item = pbmd.NodeTreeItem(breadcrumb_node, tmp_children_nodes)
+            else:
+                tmp_children_nodes = []
+                for child_node in breadcrumb_node.getChildren():
+                    if child_node == previous_tree_item.node:
+                        tmp_children_nodes.append(previous_tree_item)
+                    else:
+                        sibling_node = pbmd.NodeTreeItem(child_node, [])
+                        tmp_children_nodes.append(sibling_node)
+
+                previous_tree_item = pbmd.NodeTreeItem(breadcrumb_node, tmp_children_nodes)
+
+    for node in plAllowedNodes:
+        if node.parent_id==0 or node.parent_id is None:
+            if previous_tree_item is not None and node == previous_tree_item.node:
+                node_tree.append(previous_tree_item)
+            else:
+                node_tree.append(pbmd.NodeTreeItem(node, []))
+
+    return node_tree
+
+
+
+  def DIRTY_OLDbuildTreeListForMenu(self, plViewableStatusId: []) -> [pbmd.PBNode]:
+
     liOwnerIdList = self._getUserIdListForFiltering()
     
     loNodeList = pbm.DBSession.query(pbmd.PBNode).filter(pbmd.PBNode.owner_id.in_(liOwnerIdList)).filter(pbmd.PBNode.node_type==pbmd.PBNodeType.Data).filter(pbmd.PBNode.node_status.in_(plViewableStatusId)).order_by(pbmd.PBNode.parent_tree_path).order_by(pbmd.PBNode.node_order).order_by(pbmd.PBNode.node_id).all()

pboard/pboard/model/data.py

@@ -272,7 +272,7 @@ class PBNode(DeclarativeBase):
     else:
       return PBNode.getIconClassForNodeType(self.node_type)
 
-  def getBreadCrumbNodes(self):
+  def getBreadCrumbNodes(self) -> list('PBNode'):
     loNodes = []
     if self._oParent!=None:
       loNodes = self._oParent.getBreadCrumbNodes()
@@ -403,6 +403,18 @@ class PBNode(DeclarativeBase):
       return DBSession.execute("select node_id, version_id, created_at from pod_nodes_history where node_id = :node_id order by created_at desc", {"node_id":self.node_id}).fetchall()
 
 
+class NodeTreeItem(object):
+    """
+        This class implements a model that allow to simply represents the left-panel menu items
+         This model is used by dbapi but is not directly related to sqlalchemy and database
+    """
+    def __init__(self, node: PBNode, children: list('NodeTreeItem')):
+        self.node = node
+        self.children = children
+
+
+
+
 #####
 #
 # HACK - 2014-05-21 - D.A

pboard/pboard/templates/document.mak

@@ -11,45 +11,36 @@
   % endif
 </%def>
 
-<%def name="node_treeview(node_list, indentation=-1)">
-  % if indentation==-1:
-    <div id='pod-menu-item-0' class="pod-toolbar-parent" style="padding-left: 0.5em; position: relative;">
-      <a class="toggle-child-menu-items"><i class='fa fa-folder-open'></i></a>
-      <a href="${tg.url('/document')}" title="${_('Root')}">
-        ${_('Root')}
-      </a>
-    </div>
-    <div id="pod-menu-item-0-children">${node_treeview(node_list, 0)}</div>
-    
-  % else:
-    % if len(node_list)<=0 and indentation==0:
-      <p class="pod-grey">${_('You have no document yet.')}</p>
-    % endif
-    
-    % if len(node_list)>0:
-      % for node in node_list:
-        <div id='pod-menu-item-${node.node_id}' class="pod-toolbar-parent ${'pod-status-active' if current_node!=None and node.node_id==current_node.node_id else ''}" style="padding-left: ${(indentation+2)*0.5}em; position: relative;">
-          <a class="toggle-child-menu-items"><i class='${node.getIconClass()}'></i></a>
-          <a href="${tg.url('/document/%s'%(node.node_id))}" title="${node.data_label}">
-            % if node.getStatus().status_family=='closed' or node.getStatus().status_family=='invisible':
-              <strike>
-            % endif
-                ${node.getTruncatedLabel(32-0.8*(indentation+1))}
-            % if node.getStatus().status_family=='closed' or node.getStatus().status_family=='invisible':
-              </strike>
-            % endif
-          </a>
-          <div class="pod-toolbar">
-            <a href="${tg.url('/api/move_node_upper?node_id=%i'%(node.node_id))}" title="${_('Move up')}"><i class="fa fa-arrow-up"></i></a>
-            <a href="${tg.url('/api/move_node_lower?node_id=%i'%(node.node_id))}" title="${_('Move down')}"><i class="fa fa-arrow-down"></i></a>
-          </div>
-          <div class="pod-status ${node.getStatus().css}" title='${node.getStatus().label}'>
-             <i class='${node.getStatus().icon}'></i>
-          </div>
+<%def name="node_treeview(node_list, indentation=0)">
+  % if len(node_list)<=0 and indentation==0:
+    <p class="pod-grey">${_('You have no document yet.')}</p>
+  % endif
+
+  % if len(node_list)>0:
+    % for item in node_list:
+      <div id='pod-menu-item-${item.node.node_id}' class="pod-toolbar-parent ${'pod-status-active' if current_node!=None and item.node.node_id==current_node.node_id else ''}" style="padding-left: ${(indentation+2)*0.5}em; position: relative;">
+        <a class="toggle-child-menu-items"><i class='${item.node.getIconClass()}'></i></a>
+        <a href="${tg.url('/document/%s'%(item.node.node_id))}" title="${item.node.data_label}">
+          % if item.node.getStatus().status_family=='closed' or item.node.getStatus().status_family=='invisible':
+            <strike>
+          % endif
+              ${item.node.getTruncatedLabel(32-0.8*(indentation+1))}
+          % if item.node.getStatus().status_family=='closed' or item.node.getStatus().status_family=='invisible':
+            </strike>
+          % endif
+        </a>
+        <div class="pod-toolbar">
+          <a href="${tg.url('/api/move_node_upper?node_id=%i'%(item.node.node_id))}" title="${_('Move up')}"><i class="fa fa-arrow-up"></i></a>
+          <a href="${tg.url('/api/move_node_lower?node_id=%i'%(item.node.node_id))}" title="${_('Move down')}"><i class="fa fa-arrow-down"></i></a>
         </div>
-        <div id="pod-menu-item-${node.node_id}-children">${node_treeview(node.getStaticChildList(), indentation+1)}</div>
-      % endfor
-    % endif
+        <div class="pod-status ${item.node.getStatus().css}" title='${item.node.getStatus().label}'>
+           <i class='${item.node.getStatus().icon}'></i>
+        </div>
+      </div>
+      % if len(item.children)>0:
+        <div id="pod-menu-item-${item.node.node_id}-children">${node_treeview(node_list=item.children, indentation=indentation+1)}</div>
+      % endif
+    % endfor
   % endif
 </%def>
 
@@ -80,7 +71,7 @@
   <div class="row">
     <div id='application-left-panel' class="span3">
       <div>
-        ${node_treeview(root_node_list)}
+        ${node_treeview(menu_node_list)}
       </div>
     </div>
     <div id='application-main-panel' class="span9">
@@ -100,7 +91,7 @@
             ##
             ## The Toolbar is a div with a specific id
             ##
-            ${DOC.Toolbar(current_node, node_status_list, root_node_list, 'current-document-toobar')}
+            ${DOC.Toolbar(current_node, node_status_list, root_node_list_for_select_field, 'current-document-toobar')}
             ${DOC.ShowTitle(current_node, keywords, 'current-document-title')}
             ${DOC.ShowContent(current_node, keywords)}
           </div>
@@ -137,7 +128,7 @@
               <div class="tab-pane" id="contacts">${DOCTABS.ContactTabContent(current_node)}</div>
               <div class="tab-pane" id="comments">${DOCTABS.CommentTabContent(current_node)}</div>
               <div class="tab-pane" id="files">${DOCTABS.FileTabContent(current_node)}</div>
-			  <div class="tab-pane" id="history">${DOCTABS.HistoryTabContent(current_node)}</div>
+              <div class="tab-pane" id="history">${DOCTABS.HistoryTabContent(current_node)}</div>
               <div class="tab-pane" id="accessmanagement">${DOCTABS.AccessManagementTab(current_node)}</div>
             </div>
           </div>