correct model to accept null objects ? V00.07.02
authorymh <ymh.work@gmail.com>
Fri, 25 Oct 2013 16:41:57 +0200
changeset 212 ee7b5831d382
parent 211 d87f6bdee43d
child 213 2e738512336a
correct model to accept null objects ? + version update
client/js/main.js
client/js/models.js
server/pom.xml
server/src/main/java/org/iri_research/renkan/Constants.java
--- a/client/js/main.js	Fri Oct 25 01:20:25 2013 +0200
+++ b/client/js/main.js	Fri Oct 25 16:41:57 2013 +0200
@@ -13,7 +13,7 @@
 var $ = Rkns.$ = root.jQuery;
 var _ = Rkns._ = root._;
 
-Rkns.VERSION = '0.2.2';
+Rkns.VERSION = '0.2.3';
 
 Rkns.pickerColors = ["#8f1919", "#a80000", "#d82626", "#ff0000", "#e87c7c", "#ff6565", "#f7d3d3", "#fecccc",
     "#8f5419", "#a85400", "#d87f26", "#ff7f00", "#e8b27c", "#ffb265", "#f7e5d3", "#fee5cc",
--- a/client/js/models.js	Fri Oct 25 01:20:25 2013 +0200
+++ b/client/js/models.js	Fri Oct 25 16:41:57 2013 +0200
@@ -196,13 +196,19 @@
         validate: function(options) {
             var _project = this;
             _(options.users).each(function(_item) {
-                _item.project = _project;
+                if(_item) {
+                    _item.project = _project;
+                }
             });
             _(options.nodes).each(function(_item) {
-                _item.project = _project;
+                if(_item) {
+                    _item.project = _project;
+                }
             });
             _(options.edges).each(function(_item) {
-                _item.project = _project;
+                if(_item) {
+                    _item.project = _project;
+                }
             });
         },
         // Add event handler to remove edges when a node is removed
@@ -219,7 +225,7 @@
     });
     
     var RosterUser = Models.RosterUser = Backbone.Model.extend({
-        type: "roster_user",               
+        type: "roster_user",
         idAttribute : "_id",
         
         constructor: function(options) {
--- a/server/pom.xml	Fri Oct 25 01:20:25 2013 +0200
+++ b/server/pom.xml	Fri Oct 25 16:41:57 2013 +0200
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.iri_research.renkan</groupId>
     <artifactId>renkan</artifactId>
-    <version>0.7.1</version>
+    <version>0.7.2</version>
     <packaging>war</packaging>
 
     <properties>
--- a/server/src/main/java/org/iri_research/renkan/Constants.java	Fri Oct 25 01:20:25 2013 +0200
+++ b/server/src/main/java/org/iri_research/renkan/Constants.java	Fri Oct 25 16:41:57 2013 +0200
@@ -20,7 +20,7 @@
 		{
 			add("0");
 			add("7");
-			add("1");
+			add("2");
 			add("final");
 			add("0");
 		}