web client: handle conditional read-only fields correctly

1 files changed, 11 insertions, 5 deletions

diff --git a/web/client.js b/web/client.js
index 2ae17ec..f12c2e8 100644
--- a/web/client.js
+++ b/web/client.js
@@ -489,9 +489,11 @@ $(function() {
 		    data, name, meta, level, editable, removable
 		);
 
-		if (editable && meta.editable) {
-		    this.data = data;
-		    this.name = name;
+		this.data = data;
+		this.name = name;
+		this.editable = editable && meta.editable;
+
+		if (this.editable) {
 		    this.onChange(this.validate);
 		    if (data.status(name) == "invalid") this.validate();
 		}
@@ -523,7 +525,7 @@ $(function() {
 	    };
 
 	    Field.onChange = function(cb) {
-		this.field.change(_.bind(cb, this));
+		if (this.editable) this.field.change(_.bind(cb, this));
 	    }
 
 	    Field.validate = function() {
@@ -555,7 +557,11 @@ $(function() {
 		});
 	    };
 
-	    Field.get = function() { return this.field.val() || null; };
+	    Field.get = function() {
+		return this.editable ? (
+		    this.field.val() || null
+		) : this.data.get(this.name);
+	    };
 
 
 	    var ComboBox = Object.create(Field);