Added default value support for non dynamic parameter groups.

The "defaultValue" property coming from the json defining a dashboard for NON DYNAMIC parameter groups was being ignored when rendering default values, but no longer.
ezbz · Jan 29, 2014 · efb1d71 · efb1d71
1 parent d059b76
commit efb1d71
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/js/dashboard.js b/js/dashboard.js
@@ -260,7 +260,7 @@ function renderValueParamGroup(paramGroupName, paramGroup) {
 	$("#" + paramGroupName).append(_.template(tmplParamSelItem, {
 		group: paramGroupName,
 		params: paramGroup,
-		selected: getDefaultValue(paramGroupName)
+		selected: getDefaultValue(paramGroupName, paramGroup)
 	}));
 	$("#" + paramGroupName).select2({
 		placeholder: "Select a " + paramGroupName,
@@ -273,13 +273,15 @@ function renderValueParamGroup(paramGroupName, paramGroup) {
 	});
 }
 
-function getDefaultValue(paramGroupName) {
+function getDefaultValue(paramGroupName, paramGroup) {
 	if (queryParam(paramGroupName)) {
 		return queryParam(paramGroupName);
 	} else if (dynamicParams[paramGroupName] && dynamicParams[paramGroupName].defaultValue) {
 		return dynamicParams[paramGroupName].defaultValue;
+	} else if (paramGroup && paramGroup.defaultValue) {
+		return paramGroup.defaultValue
 	} else {
-		return "";
+	    return ""
 	}
 }
 
@@ -657,4 +659,4 @@ function togglePinnedParametersToolbar() {
 		$("#parameters-toolbar").css("position", "relative");
 		$("#parameters-toolbar").css("opacity", "1");
 	}
-}
+}