web client: show user-friendly value in read-only ComboBox widgets

1 files changed, 17 insertions, 8 deletions

diff --git a/web/client.js b/web/client.js
index 6ccb917..a062e3f 100644
--- a/web/client.js
+++ b/web/client.js
@@ -510,7 +510,7 @@ $(function() {
 		    var status = data.status(name);
 
 		    if (!editable || meta.editable == false) {
-			var el = this.staticRender(value);
+			var el = this.staticRender(value, meta);
 			setStatus(el, status);
 			return el;
 		    }
@@ -629,7 +629,7 @@ $(function() {
 		    return el;
 		},
 
-		staticRender: function(value) {
+		staticRender: function(value, meta) {
 		    return $("<td>").text(value);
 		},
 
@@ -706,6 +706,15 @@ $(function() {
 	    var ComboBox = Field.extend({
 		createEl: function() { return $("<select>"); },
 
+		staticRender: function(value, meta) {
+		    return this.super(
+			ComboBox,
+			"staticRender",
+			_.findWhere(meta.choice, {value: value})["ui-value"],
+			meta
+		    );
+		},
+
 		render: function(value, meta) {
 		    var el = this.field.empty();
 
@@ -729,7 +738,7 @@ $(function() {
 	    });
 
 	    var CheckBox = Field.extend({
-		staticRender: function(value) {
+		staticRender: function(value, meta) {
 		    return $("<td>").text(value ? "Yes" : "No");
 		},
 
@@ -744,13 +753,13 @@ $(function() {
 
 
 	    var Link = Widget.extend({
-		staticRender: objectRef,
+		staticRender: function(value, meta) {
+		    return objectRef(value);
+		},
 
 		createEl: href,
 
-		render: function(value, meta) {
-		    this.staticRender(value, this.el)
-		},
+		render: function(value, meta) { objectRef(value, this.el) },
 
 		wrap: function() { return $("<td>").html(this.el); },
 		
@@ -1145,7 +1154,7 @@ $(function() {
 		    );
 		},
 		
-		staticRender: function(value) {
+		staticRender: function(value, meta) {
 		    return objectRef(value).text(value);
 		},