Merge pull request #1736 from priyaganti/issue#1579-rockonSwitchWitho…

…utConfig display config modal when rockon is not configured but switch is turned on. fixes #1579
rockstor · Jun 24, 2017 · 746dd47 · 746dd47
2 parents 40e6bf2 + df4a66f
commit 746dd47
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js b/src/rockstor/storageadmin/static/storageadmin/js/views/configure_service.js
@@ -354,6 +354,9 @@ To alert on temperature changes: <br> <strong>DEVICESCAN -W 4,35,40</strong> <br
                 jqxhr.done(function() {
                     enableButton(button);
                     $('#services_modal').modal('hide');
+                    app_router.navigate('/services', {
+                        trigger: true
+                    });
                 });
 
                 jqxhr.fail(function(xhr, status, error) {

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/services.js b/src/rockstor/storageadmin/static/storageadmin/js/views/services.js
@@ -131,13 +131,22 @@ ServicesView = Backbone.View.extend({
     },
 
     switchStatus: function(event, state) {
-
+        console.log("the event is: " + event + " The state is: " + state);
         var serviceName = $(event.target).attr('data-service-name');
-        if (state) {
-            this.startService(serviceName);
+        var serviceModel = this.collection.get(serviceName); // extract the service model from the collection to obtain config property
+
+        if (this.configurable_services.indexOf(serviceName) > -1 && !serviceModel.get('config') && state) {
+            app_router.navigate('services/' + serviceName + '/edit', {
+                trigger: true
+            });
         } else {
-            this.stopService(serviceName);
+            if (state) {
+                this.startService(serviceName);
+            } else {
+                this.stopService(serviceName);
+            }
         }
+
     },
 
     startService: function(serviceName) {