Merge pull request #1302 from gberginc/fix/storage_manager_id

Fix the storage manager id for cloud volume views
ManageIQ · May 8, 2017 · 83e21a2 · 83e21a2
2 parents 91a9c32 + 6dfe2cc
commit 83e21a2
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/app/views/cloud_object_store_container/new.html.haml b/app/views/cloud_object_store_container/new.html.haml
@@ -61,5 +61,5 @@
   = render :partial => "layouts/angular/generic_form_buttons"
 
 :javascript
-  ManageIQ.angular.app.value('storageManagerId', '#{@storage_manager.try(:id)}');
+  ManageIQ.angular.app.value('storageManagerId', #{@storage_manager.try(:id) || "undefined"});
   miq_bootstrap('#form_div');
diff --git a/app/views/cloud_volume/attach.html.haml b/app/views/cloud_volume/attach.html.haml
@@ -51,5 +51,5 @@
 
 :javascript
   ManageIQ.angular.app.value('cloudVolumeFormId', '#{@volume.id}');
-  ManageIQ.angular.app.value('storageManagerId', '#{@volume.ext_management_system.id}');
+  ManageIQ.angular.app.value('storageManagerId', #{@volume.ext_management_system.id});
   miq_bootstrap('#form_div');
diff --git a/app/views/cloud_volume/backup_new.html.haml b/app/views/cloud_volume/backup_new.html.haml
@@ -49,5 +49,5 @@
 
 :javascript
   ManageIQ.angular.app.value('cloudVolumeFormId', '#{@volume.id}');
-  ManageIQ.angular.app.value('storageManagerId', '#{@volume.ext_management_system.id}');
+  ManageIQ.angular.app.value('storageManagerId', #{@volume.ext_management_system.id});
   miq_bootstrap(jQuery('#form_div'));
diff --git a/app/views/cloud_volume/backup_select.html.haml b/app/views/cloud_volume/backup_select.html.haml
@@ -39,5 +39,5 @@
 
 :javascript
   ManageIQ.angular.app.value('cloudVolumeFormId', '#{@volume.id}');
-  ManageIQ.angular.app.value('storageManagerId', '#{@volume.ext_management_system.id}');
+  ManageIQ.angular.app.value('storageManagerId', #{@volume.ext_management_system.id});
   miq_bootstrap(jQuery('#form_div'));
diff --git a/app/views/cloud_volume/detach.html.haml b/app/views/cloud_volume/detach.html.haml
@@ -36,5 +36,5 @@
 
 :javascript
   ManageIQ.angular.app.value('cloudVolumeFormId', '#{@volume.id}');
-  ManageIQ.angular.app.value('storageManagerId', '#{@volume.ext_management_system.id}');
+  ManageIQ.angular.app.value('storageManagerId', #{@volume.ext_management_system.id});
   miq_bootstrap('#form_div');
diff --git a/app/views/cloud_volume/edit.html.haml b/app/views/cloud_volume/edit.html.haml
@@ -13,5 +13,5 @@
 
 :javascript
   ManageIQ.angular.app.value('cloudVolumeFormId', '#{@volume.id}');
-  ManageIQ.angular.app.value('storageManagerId', '#{@volume.ext_management_system.id}');
+  ManageIQ.angular.app.value('storageManagerId', #{@volume.ext_management_system.id});
   miq_bootstrap(jQuery('#form_div'));
diff --git a/app/views/cloud_volume/new.html.haml b/app/views/cloud_volume/new.html.haml
@@ -11,5 +11,5 @@
 
 :javascript
   ManageIQ.angular.app.value('cloudVolumeFormId', '#{@volume.id || "new"}');
-  ManageIQ.angular.app.value('storageManagerId', '#{@storage_manager.try(:id)}');
+  ManageIQ.angular.app.value('storageManagerId', #{@storage_manager.try(:id) || "undefined"});
   miq_bootstrap('#form_div');
diff --git a/app/views/cloud_volume/snapshot_new.html.haml b/app/views/cloud_volume/snapshot_new.html.haml
@@ -39,5 +39,5 @@
 
 :javascript
   ManageIQ.angular.app.value('cloudVolumeFormId', '#{@volume.id}');
-  ManageIQ.angular.app.value('storageManagerId', '#{@volume.ext_management_system.id}');
+  ManageIQ.angular.app.value('storageManagerId', #{@volume.ext_management_system.id});
   miq_bootstrap(jQuery('#form_div'));