Merge pull request #11 from mdekrijger/master

Added a way to delete nodes
symfony-cmf · Feb 23, 2012 · 81a35e5 · 81a35e5
2 parents f5582be + 919feb1
commit 81a35e5
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 6 deletions.
diff --git a/conf/commandmap.php b/conf/commandmap.php
@@ -52,8 +52,14 @@
     'method' => 'addnode',
     'view' => array('class' => 'txt')));
 
+
+      $m->route('__json__/removenode/')
+  ->config(array(
+    'command' => 'crbrowser',
+    'method' => 'removenode',
+    'view' => array('class' => 'txt')));
 
-
+	
       $m->route('__json__/delcache/')
   ->config(array(
     'command' => 'crbrowser',

diff --git a/conf/config.d/00-default.yml b/conf/config.d/00-default.yml
diff --git a/install_vendors.sh b/install_vendors.sh
@@ -13,4 +13,5 @@ cd $DIR
 git clone git://github.com/jackalope/jackalope.git jackalope
 
 cd jackalope
+git checkout 0265558e77f1adb6ef1dd950d46b50ed5869859b
 git submodule update --init --recursive
diff --git a/localinc/api/command/crbrowser.php b/localinc/api/command/crbrowser.php
@@ -246,6 +246,14 @@ function addnode() {
           $this->data = json_encode(true);
      }
 
+
+     function removenode() {
+        $sess = $this->getSession();
+        $node = $this->getNode();
+        $node->remove();
+        $sess->save();
+        $this->data = json_encode(true);
+     }	 
 
      function setproperty() {
          $sess = $this->getSession();

diff --git a/www/static/js/crbrowser.js b/www/static/js/crbrowser.js
@@ -1,13 +1,14 @@
 
 
 YAHOO.namespace("cr");
-
 YAHOO.cr.tree = function(){
 
+	var currentNode;
+
     var buildTree = function(){
         //create a new tree:
         tree = new YAHOO.widget.TreeView("treeDiv1");
-        
+		
         //turn dynamic loading on for entire tree:
         tree.setDynamicLoad(loadNodeData, true);
 
@@ -31,6 +32,7 @@ YAHOO.cr.tree = function(){
 
         tree.subscribe("labelClick", function(node){
             loadNodeProperties(node);
+			YAHOO.cr.tree.currentNode = node;
         });
 
         //render tree with these toplevel nodes; all descendants of these nodes
@@ -57,6 +59,7 @@ YAHOO.cr.tree = function(){
 
 
     }
+
 
     var loadNodeData = function(node, fnLoadComplete){
 
@@ -133,13 +136,15 @@ YAHOO.cr.tree = function(){
     return {
         init: function(){
             buildTree();
-        }
+        },
+		currentNode: currentNode
     }
 
 
 
 }();
 
+
 YAHOO.cr.propTable = function(){
 
     var myColumnDefs = null;
@@ -393,9 +398,9 @@ YAHOO.cr.versionsTable = function(){
             };
 
 			YAHOO.util.Connect.asyncRequest('GET', sUrl, callback1);
-
-
+
 		}
+
     }
 
 
@@ -444,6 +449,11 @@ YAHOO.cr.topmenu = function(){
                         fn: YAHOO.cr.dialogNewNode.show
                     }
                 }],[, {
+					text: "Remove Node",
+                    onclick: {
+                        fn: removenode
+                    }
+                }],[, {				
                     text: "Delete Cache",
                     onclick: {
                         fn: deletecache
@@ -485,6 +495,20 @@ YAHOO.cr.topmenu = function(){
             }
             YAHOO.util.Connect.asyncRequest('GET', sUrl, callback1);
     };
+    var removenode = function() {
+          var sUrl = '__json__/removenode/?fullpath=' + YAHOO.cr.propTable.currentPath;
+            var callback1 = {
+                success: null,
+                failure: null,
+            }
+            YAHOO.util.Connect.asyncRequest('GET', sUrl, callback1);
+			//YAHOO.cr.tree.init();
+			//var arr = YAHOO.cr.propTable.currentPath.split('/');
+			//arr.pop()
+			//var parent = arr.join('/');
+			//YAHOO.util.Connect.asyncRequest('GET', '__json__/tree/?fullpath=' + parent, callback1);
+			YAHOO.widget.TreeView.getTree('treeDiv1').removeNode(YAHOO.cr.tree.currentNode, true);
+    };	
     return {
         init: function(){
             initMenu();