Merge branch 'master' of bitbucket.org:lebouquetin/protov1

pboard/pboard/model/serializers.py

@@ -2,22 +2,29 @@
 import tg
 from pboard.model import data as pmd
 
+def node_to_dict(node: pmd.PBNode, children_content, new_item_state):
+    """
+        children_content may be boolean or a list containing json values
+    """
+    url = tg.url('/document/', dict(node_id=node.node_id)) ## FIXME - 2014-05-27 - Make this more flexible
+
+    return dict(
+        id = node.node_id,
+        children = children_content,
+        text = node.data_label,
+        a_attr = { "href" : url },
+        li_attr = { "title": node.data_label },
+        type = node.node_type, # this property is understandable by jstree (through "types" plugin)
+        state = new_item_state,
+        node_status = node.getStatus().getId() # this is not jstree understandable data. This requires a JS 'success' callback
+    )
+
+
 def PBNodeForMenu(func):
 
     def process_item(item: pmd.PBNode):
         """ convert given item into a dictionnary """
-        url = tg.url('/document/', dict(node_id=item.node_id)) ## FIXME - 2014-05-27 - Make this more flexible
-        print("########## BEFORE ##########")
-        new_item = dict(
-            id = item.node_id,
-            children = item.getChildNb()>0,
-            text = item.data_label,
-            # parent = item._oParent.node_id if (item._oParent!=None) else '#',
-            a_attr = { "href" : url },
-            li_attr = { "title": item.data_label }
-        )
-        print("########## AFTER ##########")
-        return new_item
+        return node_to_dict(item, item.getChildNb()>0, None)
 
     def pre_serialize(*args, **kws):
         initial_result = func(*args, **kws)
@@ -43,11 +50,10 @@ def NodeTreeItemForMenu(func):
         """ convert given item into a dictionnary """
 
         item = structure_item.node
-        url = tg.url('/document/', dict(node_id=item.node_id)) ## FIXME - 2014-05-27 - Make this more flexible
         children = []
+
         for child_item in structure_item.children:
             children.append(process_item(child_item, current_node_id))
-        # print("########## BEFORE ##########")
 
         children_field_value = None
         if len(children)>0:
@@ -58,21 +64,11 @@ def NodeTreeItemForMenu(func):
             children_field_value = False
 
         new_item_state = dict(
-            opened = len(children)>0,
+            opened = item.getChildNb()<=0 or len(children)>0,
             selected = current_node_id!=None and item.node_id==current_node_id,
         )
 
-        new_item = dict(
-            id = item.node_id,
-            children = children_field_value,
-            text = item.data_label,
-            # parent = item._oParent.node_id if (item._oParent!=None) else '#',
-            state = new_item_state,
-            a_attr = { "href" : url },
-            li_attr = { "title": item.data_label }
-        )
-        # print("########## AFTER ##########")
-        return new_item
+        return node_to_dict(item, children_field_value, new_item_state)
 
     def pre_serialize(*args, **kws):
         initial_result = func(*args, **kws)

pboard/pboard/templates/document-widgets.mak

@@ -593,42 +593,60 @@
     <div class="modal-body">
     ## MODAL BODY
           <p>${_('Select the destination:')}</p>
-          <div id="${psModalId}-new-parent-selector-tree"></div>
+          <div id="${psModalId}-new-parent-selector-treeview"></div>
           <script>
-            $(function () {
-              $('#${psModalId}-new-parent-selector-tree').jstree({
-                "plugins" : [ "wholerow"],
-                'core' : {
-
-                  'error': function (error) {
-                    console.log('Error ' + error.toString())
-                  },
-                  'data' : {
-                    'dataType': 'json',
-                    'contentType': 'application/json; charset=utf-8',
-                    'url' : function (node) {
-                         return '${tg.url("/api/menu/children")}';
-                    },
-                    'data' : function(node) {
-                      console.log("NODE => "+JSON.stringify(node))
-                      return {
-                        'id' : node.id
-                      };
-                    },
-                    'success': function (new_data) {
-                      console.log('loaded new menu data' + new_data)
-                      return new_data;
-                    },
-                  },
-                }
-              });
+              /** return true or false if the node should be shown in the "move item" dialog treeview 
+               */
+              function shouldRemoveNodeFromMoveTreeView(parentTreeItem, currentTreeItem, rootList) {
+                  if(currentTreeItem.id==${poNode.node_id}) {
+                      console.log('Say OK to remove item #'+currentTreeItem.id+' from menu');
+                      return true;
+                  }
+                  return false;
+              }
+
+              $(function () {
+                  $('#${psModalId}-new-parent-selector-treeview').jstree({
+                      "plugins" : [ "wholerow"],
+                      'core' : {
+                          'error': function (error) {
+                              console.log('Error ' + error.toString())
+                          },
+                          'data' : {
+                              'dataType': 'json',
+                              'contentType': 'application/json; charset=utf-8',
+                              'url' : function (node) {
+                                  if (node.id==='#') {
+                                      return '${tg.url("/api/menu/initialize", dict(current_node_id=poNode._oParent.node_id if poNode._oParent else 0))}';
+                                  } else {
+                                      return '${tg.url("/api/menu/children")}';
+                                  }
+                              },
+                              'data' : function(node) {
+                                  console.log("NODE => "+JSON.stringify(node))
+                                  return {
+                                      'id' : node.id
+                                  };
+                              },
+                              'success': function (new_data) {
+                                  console.log('loaded new menu data (for move operation)' + new_data)
+                                  console.log(new_data);
+
+                                  for (var i = new_data['d'].length; i--;) {
+                                      prepareOrRemoveTreeNode(null, new_data['d'][i], new_data['d'], shouldRemoveNodeFromMoveTreeView);
+                                  }
+                                  return new_data;
+                              },
+                          },
+                      }
+                  });
               
-              $('#${psModalId}-new-parent-selector-tree').on("select_node.jstree", function (e, data) {
-                new_parent_id_selected = data.selected[0];
-                $("#${psModalId}-form-new-parent-field").attr("value", new_parent_id_selected)
-                console.log("About to move document "+${poNode.node_id}+" as child of "+new_parent_id_selected);
+                  $('#${psModalId}-new-parent-selector-treeview').on("select_node.jstree", function (e, data) {
+                      new_parent_id_selected = data.selected[0];
+                      $("#${psModalId}-form-new-parent-field").attr("value", new_parent_id_selected)
+                      console.log("About to move document "+${poNode.node_id}+" as child of "+new_parent_id_selected);
+                  });
               });
-            });
           </script>
           <form id='${psModalId}-form' method="POST" action="${psPostUrl}" enctype="multipart/form-data">
             <input type="hidden" name="node_id" value="${poNode.node_id}"/>

pboard/pboard/templates/document.mak

@@ -81,62 +81,98 @@
       <link rel="stylesheet" href="${tg.url('/jstree/dist/themes/default/style.min.css')}" />
       <script src="${tg.url('/jstree/dist/jstree.js')}"></script>
       <style>
-        #mypodtree {overflow:hidden;}
-        #mypodtree:hover {overflow:visible; }
+        #left-menu-treeview {overflow:hidden;}
+        #left-menu-treeview:hover {overflow:visible; }
       </style>
       <h5>${_('Content explorer')}</h5>
-      <div id="mypodtree"></div>
+      <div id="left-menu-treeview"></div>
       <script>
-        $(function () {
-          $('#mypodtree').jstree({
-            "plugins" : [ "wholerow"],
-            'core' : {
-
-              'error': function (error) {
-                console.log('Error ' + error.toString())
-              },
-              'data' : {
-                'dataType': 'json',
-                'contentType': 'application/json; charset=utf-8',
-                'url' : function (node) {
-                  if (node.id==='#') {
-                    return '${tg.url("/api/menu/initialize", dict(current_node_id=current_node.node_id if current_node else 0))}';
+          function prepareOrRemoveTreeNode(parentTreeViewItem, currentTreeViewItem, rootList, shouldRemoveNodeCallBack) {
+              // In case parentTreeViewItem is Null, then use rootList as the parent
+              
+              console.log("node #"+currentTreeViewItem.id+' => '+currentTreeViewItem.node_status);
+              
+              if(shouldRemoveNodeCallBack && shouldRemoveNodeCallBack(parentTreeViewItem, currentTreeViewItem, rootList)) {
+                  console.log('Will remove node #'+currentTreeViewItem.id+' from tree view');
+                  if(parentTreeViewItem!=null) {
+                    var currentTreeViewItemPosition = parentTreeViewItem.children.indexOf(currentTreeViewItem);
+                    if(currentTreeViewItemPosition != -1) {
+                        parentTreeViewItem.children.splice(currentTreeViewItemPosition, 1);
+                    }
                   } else {
-                    return '${tg.url("/api/menu/children")}';
+                    var currentTreeViewItemPosition = rootList.indexOf(currentTreeViewItem);
+                    if(currentTreeViewItemPosition != -1) {
+                        rootList.splice(currentTreeViewItemPosition, 1);
+                    }
                   }
-                },
-                'data' : function(node) {
-                  console.log("NODE => "+JSON.stringify(node))
-                  return {
-                    'id' : node.id
-                  };
-                },
-                'success': function (new_data) {
-                  console.log('loaded new menu data' + new_data)
-                  console.log(new_data);
-                  return new_data;
-                },
-              },
-            }
-          });
-          
-          $('#mypodtree').on("select_node.jstree", function (e, data) {
-            url = "${tg.url('/document/')}"+data.selected[0];
-            console.log("Opening document: "+url);
-            location.href = url;
-          });
+                  
+              } else {
+                  for (var i = currentTreeViewItem.children.length; i--;) {
+                    console.log('processing node #'+currentTreeViewItem.children[i].id);
+                    prepareOrRemoveTreeNode(currentTreeViewItem, currentTreeViewItem.children[i], rootList, shouldRemoveNodeCallBack);
+                  }
+              }
+          }
+        
+          function shouldRemoveNodeDoneCallBack(parentTreeViewItem, currentTreeViewItem, rootList) {
+              if(currentTreeViewItem.node_status=='done' || currentTreeViewItem.node_status=='closed') {
+                  console.log('Hide item #'+currentTreeViewItem.id+' from menu (status is '+currentTreeViewItem.node_status+')');
+                  return true;
+              }
+              return false;
+          }
+        
+          $(function () {
+              $('#left-menu-treeview').jstree({
+                  'plugins' : [ 'wholerow', 'types' ],
+                  'core' : {
+                      'error': function (error) {
+                          console.log('Error ' + error.toString())
+                      },
+                      'data' : {
+                          'dataType': 'json',
+                          'contentType': 'application/json; charset=utf-8',
+                          'url' : function (node) {
+                              if (node.id==='#') {
+                                  return '${tg.url("/api/menu/initialize", dict(current_node_id=current_node.node_id if current_node else 0))}';
+                              } else {
+                                  return '${tg.url("/api/menu/children")}';
+                              }
+                          },
+                          'data' : function(node) {
+                              console.log("NODE => "+JSON.stringify(node))
+                              return {
+                                  'id' : node.id
+                              };
+                          },
+                          'success': function (new_data) {
+                              console.log('loaded new menu data' + new_data)
+                              console.log(new_data);
+
+                              for (var i = new_data['d'].length; i--;) {
+                                  prepareOrRemoveTreeNode(null, new_data['d'][i], new_data['d'], shouldRemoveNodeDoneCallBack);
+                              }
+                              return new_data;
+                          },
+                      },
+                  }
+              });
           
-          $('#mypodtree').on("loaded.jstree", function () {
-            nodes = $('#mypodtree .jstree-node');
-            console.log("nodes = "+nodes.length);
-            if (nodes.length<=0) {
-              $("#mypodtree").append( "<p class='pod-grey'>${_('There is no content yet.')|n}" );
-              $("#mypodtree").append( "<p><a class=\"btn btn-success\" data-toggle=\"modal\" role=\"button\" href=\"#add-document-modal-form\"><i class=\"fa fa-plus\"></i> ${_('Create a topic')}</a></p>" );
-              
-              
-            }
+              $('#left-menu-treeview').on("select_node.jstree", function (e, data) {
+                  url = "${tg.url('/document/')}"+data.selected[0];
+                  console.log("Opening document: "+url);
+                  location.href = url;
+              });
+            
+              $('#left-menu-treeview').on("loaded.jstree", function () {
+                  nodes = $('#left-menu-treeview .jstree-node');
+                  console.log("nodes = "+nodes.length);
+                  if (nodes.length<=0) {
+                      $("#left-menu-treeview").append( "<p class='pod-grey'>${_('There is no content yet.')|n}" );
+                      $("#left-menu-treeview").append( "<p><a class=\"btn btn-success\" data-toggle=\"modal\" role=\"button\" href=\"#add-document-modal-form\"><i class=\"fa fa-plus\"></i> ${_('Create a topic')}</a></p>" );
+                  }
+              });
           });
-        });
       </script>
 ## INFO - D.A. - 2014-05-28 - Hide old school menu
 ##      <div>