web client: properly handle required conditional fields

1 files changed, 22 insertions, 11 deletions

diff --git a/web/client.js b/web/client.js
index aa681a8..9bc6329 100644
--- a/web/client.js
+++ b/web/client.js
@@ -82,6 +82,12 @@ $(function() {
 		    _.contains(["collection", "model"], meta.type);
 	    }
 
+	    function match(data, filter) {
+		return _.every(_.map(filter, function(values, key) {
+		    return _.contains(values, data[key]);
+		}));
+	    }
+
 	    
 	    var txnMgr = (function(token, saveRequired) {
 		var txn, changed, invalid;
@@ -256,7 +262,10 @@ $(function() {
 							    mpath, field.name
 							);
 							if (field.required &&
-							    !field.condition &&
+							    match(
+								data.data,
+								field.condition
+							    ) &&
 							    !(mmpath in invalid) &&
 							    data.get(
 								field.name
@@ -677,19 +686,21 @@ $(function() {
 			    var validate = false;
 			    function change() {
 				var f = self.fields[field.name];
-				var visible = _.every(_.map(
-				    field.condition,
-				    function(values, key) {
-					return _.contains(
-					    values,
-					    self.fields[key].widget.get()
-					);
-				    }
-				));
-				if (visible) {
+
+				if (match(
+				    _.object(_.map(
+					self.fields,
+					function(field, name) {
+						return [name, field.widget.get()];
+					    }
+				    )),
+				    field.condition)
+				   ) {
+
 				    if (validate) f.widget.validate();
 				    f.el.show();
 				}
+
 				else f.el.hide();
 			    }
 			    change();