From 226b44eedd6f6a7b171773f4c9a780699144e708 Mon Sep 17 00:00:00 2001
From: Mirko Arena <mirko.arena@gmail.com>
Date: Sat, 9 Jul 2016 12:59:14 +0200
Subject: [PATCH] #518 - Fixed config page, selects now correctly show current
 stored values

---
 .../services/configure_shellinaboxd.jst       |  6 ++--
 .../js/views/configure_service.js             | 32 +++++++++++++++++++
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/services/configure_shellinaboxd.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/services/configure_shellinaboxd.jst
index be17098eb..c8692f6a3 100644
--- a/src/rockstor/storageadmin/static/storageadmin/js/templates/services/configure_shellinaboxd.jst
+++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/services/configure_shellinaboxd.jst
@@ -31,8 +31,7 @@
 			<label class="col-sm-4 control-label" for="shelltype">Shell connection service<span class="required"> *</span></label>
 			<div class="col-sm-4">
 			<select class="form-control" id="shelltype" name="shelltype">
-				<option value="LOGIN">LOGIN</option>
-				<option value="SSH">SSH</option>
+				{{display_shelltype_options}}
 			</select>
           </div>
         </div>
@@ -41,8 +40,7 @@
 			<label class="col-sm-4 control-label" for="css">Shell color scheme<span class="required"> *</span></label>
 			<div class="col-sm-4">
 			<select class="form-control" id="css" name="css">
-				<option value="white-on-black">White on Black</option>
-				<option value="black-on-white">Black on White</option>
+				{{display_shellstyle_options}}
 			</select>
           </div>
         </div>      
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js b/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js
index b9965351d..5a0dfaebd 100644
--- a/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js
+++ b/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js
@@ -380,6 +380,38 @@ To alert on temparature changes: <br> <strong>DEVICESCAN -W 4,35,40</strong> <br
     },
 
     initHandlebarHelpers: function(){
+	
+	//ShellInABox
+	Handlebars.registerHelper('display_shelltype_options', function(){
+		var html = '',
+		_this = this;
+		var avail_shells = ['LOGIN', 'SSH'];
+		_.each(avail_shells, function(shell, index) {
+			if (shell == _this.config.shelltype) {
+				html += '<option value="' + shell + '" selected="selected">';
+				html += shell + '</option>';
+			} else {
+				html += '<option value="' + shell + '">' + shell + '</option>';
+			}			
+		});
+	    return new Handlebars.SafeString(html);		
+	});
+	
+	Handlebars.registerHelper('display_shellstyle_options', function(){
+		var html = '',
+		_this = this;
+		var avail_styles = {'white-on-black': 'White on Black', 'black-on-white': 'Black on White'};
+		_.each(avail_styles, function(key, val) {
+			if (val == _this.config.css) {
+				html += '<option value="' + val + '" selected="selected">';
+				html += key + '</option>';
+			} else {
+				html += '<option value="' + val + '">' + key + '</option>';
+			}			
+		});
+	    return new Handlebars.SafeString(html);		
+	});
+	
 	//NUT-UPS
 	Handlebars.registerHelper('display_nutMode_options', function(){
 	    var html = '',