correct mydataParam in IHM

Elena.Budnik
1 parent a8512cd5
Showing 3 changed files with 18 additions and 25 deletions Show diff stats
js/app/models/InteractiveNode.js
js/app/models/MyDataParamNode.js
php/classes/AmdaAction.php
@@ -166,18 +166,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
     isValidName : function(name, callBackFn)
     {
     	var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isLeaf()};
-    	AmdaAction.validNameObject(dataToSend, callBackFn);
-    	
-       /*if (name.match(/[a-z,0-9]/gi)) {
-            var subTreeRoot = this.getRootNode();	            
-            //TODO - check to be sure that preload is already applied before to use the isValidName function (normally, this is the case)
-            var nodeWithSameName = subTreeRoot.findChild('text', name, true);
-            if (nodeWithSameName !== null && this !== nodeWithSameName) {
-                return "This name already exists in this subtree!<br/>Do you want to overwrite it?";
-            } else return true;        
-        } else { 	 
-            return "Name is required";
-       }*/
+    	AmdaAction.validNameObject(dataToSend, callBackFn);    	
     },
     /**
@@ -40,7 +40,8 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
         if (this.get('isSpectra')) this.set('iconCls', 'icon-spectra');          
     },
-    localMenuItems : function() {
+    localMenuItems : function() 
+    {
         var menuItems =
             [{
                 fnId : 'root-upload',
@@ -74,12 +75,16 @@ Ext.define(&#39;amdaModel.MyDataParamNode&#39;, {
         return menuItems;
     },
-    getAllContextMenuItems: function(){      
-        return  this.localMenuItems();
-    },
+    getAllContextMenuItems: function() 
+    {	    
+	var menuItems = this.allMenuItems('Parameter');
+	var locMenuItems = this.localMenuItems();
-    onMenuItemClick : function(menu,item,event) {
+	return  Ext.Array.merge(menuItems,locMenuItems);           
+    },
+    onMenuItemClick : function(menu,item,event) 
+    {
         var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
         switch (fnId) {
@@ -141,8 +141,7 @@ class AmdaAction {
                 $specialNode = false;
                 $isParameter = false;
-                $skip = false;
-		$isAddable =  false;
+                $isAddable =  false;
                 $isSimulation = false;
                 $rank = null;
@@ -464,15 +463,15 @@ class AmdaAction {
                                 $obsolete = false;
                             $disable = $restricted || $nonavailable || $obsolete;
-			    $childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType,  'isAddable' => $isAddable,
-			    'info' => $info, 'leaf' => false, 'isRemoteDataSet' => $isRemoteDataSet, 'disable' => $disable, 
+                            
+				$childrenToReturn[] = array('text' => $name, 'id' => $id,'nodeType' => $nodeType,  'isAddable' => $isAddable,
+				'info' => $info, 'leaf' => false, 'isRemoteDataSet' => $isRemoteDataSet, 'disable' => $disable, 
                             'isSimulation' => $isSimulation, 'rank' => $rank, 'isDeletable' => $isDeletable, 'help' => $help);				    			 			   
 			  }
 		    break;
 		     case 'myData' :  
-			    $info = $child->hasAttribute('info') ? $child->getAttribute('info') : $child->nodeValue;
-			  //  $info = str_replace("\n","<br/>",$info);
+			    $info = $child->hasAttribute('info') ? $child->getAttribute('info') : $child->nodeValue;			 
 			    break;
                     case 'myDataParam' :
@@ -493,8 +492,8 @@ class AmdaAction {
                         }
                         if ($child->hasAttribute('desc')) {
-                            $globalStart = substr(str_replace('-','/',$child->getAttribute('desc')), 0, 16);
-                            $globalStop =  substr(str_replace( '-','/',$child->getAttribute('desc')), 17, 22);
+                            $globalStart = substr($child->getAttribute('desc'), 0, 19);
+                            $globalStop =  substr($child->getAttribute('desc'), 20);
                         }
                         $childrenToReturn[] = array('text' => $name, 'size' =>  $size, 'id' => $id,