classname fix

Author: badgeek

asset/app/js/canvas/nodecanvas_controller_base.js

@@ -45,10 +45,12 @@ DesignerApp.module("NodeCanvas.Controller", function(Controller, DesignerApp, Ba
     DesignerApp.commands.setHandler("nodecanvas:create:relation", function(containerModel, targetId) {
 
         var targetName = DesignerApp.NodeEntities.getNodeContainerFromNodeCid(targetId).get("name");
+        var targetClass = DesignerApp.NodeEntities.getNodeContainerFromNodeCid(targetId).get("classname");
 
         var view = new DesignerApp.NodeModule.Modal.CreateRelation({
             model: containerModel,
-            target: targetName
+            target: targetName,
+            targetClass: targetClass
         });
 
         var modal = DesignerApp.NodeModule.Modal.CreateTestModal(view);

asset/app/js/entities/node_entities.js

@@ -355,6 +355,12 @@ DesignerApp.module("NodeEntities", function(NodeEntities, DesignerApp, Backbone,
             raiseVent("rename");
         });
 
+
+        //on our table rename update overlay
+        relation.listenTo(sourceNodeContainer, "change:classname", function(targetNode) {
+            raiseVent("rename");
+        });
+
         //on destroy clean up
         relation.on("destroy", function() {
             raiseVent("destroy");

asset/app/js/node/node_controller.js

@@ -51,7 +51,7 @@ DesignerApp.module("NodeModule", function(NodeModule, DesignerApp, Backbone, Mar
         var conn = param.dstRelation.get("conn");
         var label = conn.getOverlay("label");
 
-        label.setLabel(srcNodeContainer.get('name') + ' ' + dstRelationModel.get('relationtype') + ' ' + dstRelationModel.get('relatedmodel'));
+        label.setLabel(srcNodeContainer.get('classname') + ' ' + dstRelationModel.get('relationtype') + ' ' + dstRelationModel.get('relatedmodel'));
     });
 
     DesignerApp.vent.on("noderelation:destroy", function(param) {

asset/app/js/node/node_modal_relation.js

@@ -4,6 +4,8 @@ DesignerApp.module("NodeModule.Modal", function(Modal, DesignerApp, Backbone, Ma
         initialize: function(param) {
             this.listenTo(this, "formDataInvalid", this.formDataInvalid);
             this.target = param.target;
+            this.targetClass = param.targetClass;
+
             //console.log(param.target);
         },
         model: Node,
@@ -26,7 +28,7 @@ DesignerApp.module("NodeModule.Modal", function(Modal, DesignerApp, Backbone, Ma
             //
             //
             if (this.target) {
-                templatevar.title = "Create Relation Between " + this.model.get('classname') + " and " + this.target;
+                templatevar.title = "Create Relation Between " + this.model.get('classname') + " and " + this.targetClass;
             }
             //
             //

asset/app/js/node/node_view.js

@@ -16,7 +16,7 @@ DesignerApp.module("NodeModule.Views", function(Views, DesignerApp, Backbone, Ma
                 }],
                 ["Label", {
                     cssClass: "label",
-                    label: srcNodeContainer.get('name') + ' ' + dstRelationModel.get('relationtype') + ' ' + dstRelationModel.get('relatedmodel'),
+                    label: srcNodeContainer.get('classname') + ' - ' + dstRelationModel.get('relationtype') + ' ' + dstRelationModel.get('relatedmodel'),
                     location: 0.3,
                     id: "label"
                 }]

index.html

@@ -248,7 +248,7 @@
         ================================================== -->
         <script type="text/template" id="nodecontainer-template">
         <div>
-        <p> <b>Table <%=name%> </b>
+        <p> <b><%=name%>:<%=classname%></b>
         <a href="#" style="display: none;" class="btn relationadd btn-xs btn-container"><span class="glyphicon glyphicon-plus"></span> r</a>
         <a href="#" class="btn seeding btn-xs btn-container"><span class="glyphicon glyphicon-eye-open"></span> s</a>        
         <a href="#" class="btn relation btn-xs btn-container"><span class="glyphicon glyphicon-eye-open"></span> r</a>
@@ -297,10 +297,10 @@
                     <label class="col-md-4 control-label" for="container-color">Color</label>
                     <div class="col-md-4">
                         <select id="container-color" name="color" class="form-control">
+                            <option value="Grey">Grey</option>                        
                             <option value="Red">Red</option>
                             <option value="Green">Green</option>
                             <option value="Blue">Blue</option>
-                            <option value="Grey">Grey</option>
                             <option value="Yellow">Yellow</option>
                         </select>
                     </div>
@@ -429,7 +429,7 @@
             <!-- Template
             ================================================== -->
             <script type="text/template" id="relationcollection-template">
-            <legend>Relation List : <%=name%> </legend>
+            <legend>Relation List Model: <%=classname%> </legend>
             <table class="table">
                 <thead>
                     <tr>