From 82569b9cb412b509d88de55bd3f15a9499dfe76e Mon Sep 17 00:00:00 2001
From: shefali shetty <sshefali44@gmail.com>
Date: Tue, 5 Jun 2012 12:30:30 +0530
Subject: collapsing done with ctrl+click event

---
 gstudio/templates/gstudio/skeleton.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'gstudio/templates/gstudio/skeleton.html')

diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html
index f8e366f..6991304 100644
--- a/gstudio/templates/gstudio/skeleton.html
+++ b/gstudio/templates/gstudio/skeleton.html
@@ -349,7 +349,7 @@ $(window).bind('keydown',function(event) {
                                
 		                 
 				
-                if(d._id>0 && d.expanded=="true")
+                if(d._id>0 && d.expanded=="true" && d._id!= {{object.id}})
 				{ 
 				
                                 $.getJSON('/nodetypes/graphs/graph_json/' + d._id , function (json2) {
@@ -393,7 +393,7 @@ $(window).bind('keydown',function(event) {
 				metadata=_.union(new_metadata,metadata);
 						
 				relations=_.union(new_relations,relations);
-				check_Relationtype(metadata,relations); 
+				relations= check_Relationtype(metadata,relations); 
 				}});						     			
 							
 			}
@@ -420,7 +420,7 @@ $(window).bind('keydown',function(event) {
         
 
 
-		else if(d._id>0)
+		else if(d._id>0 && d._id!= {{object.id}})
 				{
                                 
 				neighbour_node =neighbour_node.concat(d._id);
@@ -438,7 +438,7 @@ $(window).bind('keydown',function(event) {
 						
 				metadata=_.union(new_metadata,metadata);
 				relations=_.union(new_relations,relations);	
-                                check_Relationtype(metadata,relations);
+                                relations= check_Relationtype(metadata,relations);
 				_.each(metadata, function(m){
 				
 				  for(i=0;i<neighbour_node.length;i++)
@@ -557,7 +557,9 @@ $(window).bind('keydown',function(event) {
 
 function check_Relationtype(metadata,relations)
 {
-			_.each(metadata,function(d){
+
+	
+		_.each(metadata,function(d){
 						    if (d.refType=="Relationtype")
 							{ 
 							  a=d.inverse;
@@ -578,6 +580,7 @@ function check_Relationtype(metadata,relations)
 							}
 							 
 						 }); 
+return relations;
 
 
 }
-- 
cgit v1.1