show config form modal when rockon switch is turned on without config…

…uring rockon share. fixes #1579
rockstor · Jun 20, 2017 · 231a5e1 · 231a5e1
1 parent deb916f
commit 231a5e1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 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
@@ -133,11 +133,19 @@ ServicesView = Backbone.View.extend({
     switchStatus: function(event, 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(!serviceModel.get('config')){
+            app_router.navigate('services/docker/edit', {
+                trigger: true
+            });
         } else {
-            this.stopService(serviceName);
+            if (state) {
+                this.startService(serviceName);
+            } else {
+                this.stopService(serviceName);
+            }
         }
+
     },
 
     startService: function(serviceName) {