classname fix

Author: badgeek

asset/app/js/entities/node_entities.js

@@ -343,8 +343,8 @@ DesignerApp.module("NodeEntities", function(NodeEntities, DesignerApp, Backbone,
         });
 
         //on target table relation rename, change our reference and update overlay
-        relation.listenTo(targetNodeContainer, "change:name", function(targetNode) {
-            relation.set("relatedmodel", targetNode.get("name"), {
+        relation.listenTo(targetNodeContainer, "change:classname", function(targetNode) {
+            relation.set("relatedmodel", targetNode.get("classname"), {
                 silent: true
             });
             raiseVent("rename");
@@ -379,7 +379,7 @@ DesignerApp.module("NodeEntities", function(NodeEntities, DesignerApp, Backbone,
                 name: nodeContainer.get('name'),
                 color: nodeContainer.get('color'),
                 position: nodeContainer.get('position'),
-                modelclass: nodeContainer.get('modelclass'),
+                classname: nodeContainer.get('classname'),
                 namespace: nodeContainer.get('namespace'),
 
                 increment: nodeContainer.get('increment'),

asset/app/js/node/node_modal_relation.js

@@ -21,12 +21,12 @@ DesignerApp.module("NodeModule.Modal", function(Modal, DesignerApp, Backbone, Ma
             var templatevar = {
                 relationship: this.model.get('relation').toJSON(),
                 relatedmodel: parent.toJSON(),
-                title: "Create Relation in Table " + this.model.get('name')
+                title: "Create Relation in Model " + this.model.get('classname')
             };
             //
             //
             if (this.target) {
-                templatevar.title = "Create Relation Between " + this.model.get('name') + " and " + this.target;
+                templatevar.title = "Create Relation Between " + this.model.get('classname') + " and " + this.target;
             }
             //
             //
@@ -38,7 +38,7 @@ DesignerApp.module("NodeModule.Modal", function(Modal, DesignerApp, Backbone, Ma
                 this.$('#relation-relatedmodel').find('option[value=' + this.target + ']').attr('selected', 'selected'); //make destination selected by default
             }
 
-            this.$('#relation-relatedmodel').find('option[value=' + this.model.get('name') + ']').remove(); //remove self (model) from option list
+            this.$('#relation-relatedmodel').find('option[value=' + this.model.get('classname') + ']').remove(); //remove self (model) from option list
             //
             return this.el;
         }
@@ -67,7 +67,7 @@ DesignerApp.module("NodeModule.Modal", function(Modal, DesignerApp, Backbone, Ma
         },
         render: function() {
             var templatevar = {
-                title: 'Edit Relation in Table ' + this.container.get('name'),
+                title: 'Edit Relation in Model ' + this.container.get('classname'),
                 relationship: this.model.toJSON(),
                 //todo: change to reqreq
                 relatedmodel: DesignerApp.NodeEntities.getNodeCanvas().toJSON()
@@ -76,7 +76,7 @@ DesignerApp.module("NodeModule.Modal", function(Modal, DesignerApp, Backbone, Ma
             // console.log(this.parent);
             this.$('#relation-relatedmodel').find('option[value=' + this.model.get('relatedmodel') + ']').attr('selected', 'selected'); //make destination selected by default
             this.$('#relation-relationtype').find('option[value=' + this.model.get('relationtype') + ']').attr('selected', 'selected'); //make destination selected by default
-            this.$('#relation-relatedmodel').find('option[value=' + this.container.get('name') + ']').remove(); //remove self (model) from option list
+            this.$('#relation-relatedmodel').find('option[value=' + this.container.get('classname') + ']').remove(); //remove self (model) from option list
 
             return this.el;
 

index.html

@@ -351,7 +351,7 @@
                     <div class="col-md-4">
                         <select id="relation-relatedmodel" name="relatedmodel" class="form-control">
                             <% _.each(relatedmodel, function(related) { %>
-                            <option value="<%=related.name%>" > <%=related.name%></option>
+                            <option value="<%=related.classname%>" > <%=related.classname%></option>
                             <% }); %>
                         </select>
                     </div>