---
src/app/views/hardware_profiles/_list.haml | 2 +-
src/app/views/pool_families/_list.haml | 2 +-
.../views/pool_families/_provider_accounts.haml | 2 +-
src/app/views/pools/_list.haml | 2 +-
src/app/views/provider_accounts/_list.haml | 2 +-
src/app/views/providers/_list.haml | 2 +-
src/app/views/realms/_list.haml | 2 +-
src/app/views/roles/_list.haml | 2 +-
src/app/views/suggested_deployables/_list.haml | 2 +-
src/app/views/users/_list.haml | 2 +-
src/features/pool.feature | 8 ++++----
src/features/pool_family.feature | 6 +++---
src/features/realm.feature | 2 +-
src/features/suggested_deployables.feature | 2 +-
src/public/javascripts/application.js | 2 +-
15 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/app/views/hardware_profiles/_list.haml
b/src/app/views/hardware_profiles/_list.haml
index 31497d9..c131ac9 100644
--- a/src/app/views/hardware_profiles/_list.haml
+++ b/src/app/views/hardware_profiles/_list.haml
@@ -6,7 +6,7 @@
.content
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_hardware_profiles_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ :id => 'multidelete_button', :class => 'button danger'
= filter_table(@header, @hardware_profiles, :form_header => form_header) do |hwp|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/pool_families/_list.haml
b/src/app/views/pool_families/_list.haml
index b7112d5..fef8831 100644
--- a/src/app/views/pool_families/_list.haml
+++ b/src/app/views/pool_families/_list.haml
@@ -6,7 +6,7 @@
.content
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_pool_families_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ :id => 'multidelete_button', :class => 'button danger'
= filter_table(@header, @pool_families, :form_header => form_header) do
|pool_family|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/pool_families/_provider_accounts.haml
b/src/app/views/pool_families/_provider_accounts.haml
index 727ff28..0a6a66e 100644
--- a/src/app/views/pool_families/_provider_accounts.haml
+++ b/src/app/views/pool_families/_provider_accounts.haml
@@ -4,7 +4,7 @@
- unless @pool_family.provider_accounts.blank?
- form_tag do
- = restful_submit_tag "Remove selected", 'destroy',
multi_destroy_provider_accounts_pool_families_path(:pool_family_id => @pool_family.id),
'DELETE', :id => 'delete_button', :class => 'button danger'
+ = restful_submit_tag "Remove selected", 'destroy',
multi_destroy_provider_accounts_pool_families_path(:pool_family_id => @pool_family.id),
'DELETE', :id => 'multidelete_button', :class => 'button
danger'
= #submit_tag "Remove selected"
%table#provider_accounts_table.checkbox_table
diff --git a/src/app/views/pools/_list.haml b/src/app/views/pools/_list.haml
index 691296a..7996336 100644
--- a/src/app/views/pools/_list.haml
+++ b/src/app/views/pools/_list.haml
@@ -1,6 +1,6 @@
- form_header = capture_haml do
= link_to "New Pool", new_pool_path, { :class => 'button', :id
=> 'new_pool_button' }
- = restful_submit_tag "Destroy", "destroy",
multi_destroy_pools_path, 'DELETE', :id => 'delete_button', :class
=> 'button danger'
+ = restful_submit_tag "Destroy", "destroy",
multi_destroy_pools_path, 'DELETE', :id => 'multidelete_button', :class
=> 'button danger'
= label_tag "More actions"
= select_tag("more_actions",nil, :disabled => true)
= filter_table(@header, @pools, :form_header => form_header) do |pool|
diff --git a/src/app/views/provider_accounts/_list.haml
b/src/app/views/provider_accounts/_list.haml
index 0b9bf92..0ff190d 100644
--- a/src/app/views/provider_accounts/_list.haml
+++ b/src/app/views/provider_accounts/_list.haml
@@ -6,7 +6,7 @@
.content
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_provider_accounts_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ :id => 'multidelete_button', :class => 'button danger'
= filter_table(@header, @accounts, :form_header => form_header) do |account|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/providers/_list.haml b/src/app/views/providers/_list.haml
index 7b4b528..6cc640a 100644
--- a/src/app/views/providers/_list.haml
+++ b/src/app/views/providers/_list.haml
@@ -6,7 +6,7 @@
.content
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_providers_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ :id => 'multidelete_button', :class => 'button danger'
= filter_table(@header, @providers, :form_header => form_header) do |provider|
%tr{:class => cycle('nostripe', 'stripe')}
diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml
index 67d8c33..7a65e7a 100644
--- a/src/app/views/realms/_list.haml
+++ b/src/app/views/realms/_list.haml
@@ -6,7 +6,7 @@
.content
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_realms_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ :id => 'multidelete_button', :class => 'button danger'
= filter_table(@header, @realms, :form_header => form_header) do |realm|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/roles/_list.haml b/src/app/views/roles/_list.haml
index 50abace..df35595 100644
--- a/src/app/views/roles/_list.haml
+++ b/src/app/views/roles/_list.haml
@@ -6,7 +6,7 @@
.content
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_roles_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ :id => 'multidelete_button', :class => 'button danger'
= filter_table(@header, @roles, :form_header => form_header) do |role|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/suggested_deployables/_list.haml
b/src/app/views/suggested_deployables/_list.haml
index 5daf56a..b3178b4 100644
--- a/src/app/views/suggested_deployables/_list.haml
+++ b/src/app/views/suggested_deployables/_list.haml
@@ -6,7 +6,7 @@
.content
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_suggested_deployables_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ :id => 'multidelete_button', :class => 'button danger'
= filter_table(@header, @suggested_deployables, :form_header => form_header) do
|suggested_deployable|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/app/views/users/_list.haml b/src/app/views/users/_list.haml
index c7217bc..ef0f602 100644
--- a/src/app/views/users/_list.haml
+++ b/src/app/views/users/_list.haml
@@ -6,7 +6,7 @@
.content
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_users_path, 'DELETE',
- :id => 'delete_button', :class => 'button danger'
+ :id => 'multidelete_button', :class => 'button danger'
= filter_table(@header, @users, :form_header => form_header) do |user|
%tr{:class => cycle('nostripe','stripe')}
diff --git a/src/features/pool.feature b/src/features/pool.feature
index 79021d8..d8815e9 100644
--- a/src/features/pool.feature
+++ b/src/features/pool.feature
@@ -58,7 +58,7 @@ Feature: Manage Pools
Then there should be 3 pools
When I check "Redhat Voyager Pool" pool
And I check "Amazon Startrek Pool" pool
- And I press "delete_button"
+ And I press "multidelete_button"
Then there should only be 1 pools
And I should be on the pools page
When I go to the pools page
@@ -97,7 +97,7 @@ Feature: Manage Pools
Given I am on the pools page
When I follow link with ID "filter_view"
And I check "Default" pool
- And I press "delete_button"
+ And I press "multidelete_button"
Then I should see "The default pool cannot be deleted"
And I should see "Default"
@@ -106,7 +106,7 @@ Feature: Manage Pools
And I am on the pools page
When I follow link with ID "filter_view"
And I check "pool_default" pool
- And I press "delete_button"
+ And I press "multidelete_button"
Then I should see "The default pool cannot be deleted"
And I should see "pool_default"
@@ -116,7 +116,7 @@ Feature: Manage Pools
And the deployment "testdeployment" has an instance named
"testinstance"
When I follow link with ID "filter_view"
And I check "Amazon Startrek Pool" pool
- And I press "delete_button"
+ And I press "multidelete_button"
Then I should see "was not deleted"
Scenario: View all pools in JSON format
diff --git a/src/features/pool_family.feature b/src/features/pool_family.feature
index d873c20..9f95a8c 100644
--- a/src/features/pool_family.feature
+++ b/src/features/pool_family.feature
@@ -43,14 +43,14 @@ Feature: Pool Families
And there is a pool family named "poolfamily1"
When I go to the pool families page
And I check "poolfamily1" pool family
- And I press "delete_button"
+ And I press "multidelete_button"
Then there should not exist a pool family named "poolfamily1"
Scenario: Disallow deletion of default pool family
Given I am on the pool families page
Then I should see "default"
When I check "default" pool family
- And I press "delete_button"
+ And I press "multidelete_button"
Then I should see "Could not delete the following Pool Families: default."
And I should see "default"
@@ -99,5 +99,5 @@ Feature: Pool Families
And I am on the pool family provider accounts page
Then I should see "testaccount"
When I check "testaccount" provider account
- And I press "delete_button"
+ And I press "multidelete_button"
Then there should not exist a provider account assigned to
"testpoolfamily"
diff --git a/src/features/realm.feature b/src/features/realm.feature
index 70ddc90..d1aea7e 100644
--- a/src/features/realm.feature
+++ b/src/features/realm.feature
@@ -68,7 +68,7 @@ Feature: Manage Realms
And there are 2 realms
When I check "testrealm2" realm
And I check "testrealm1" realm
- And I press "delete_button"
+ And I press "multidelete_button"
Then there should be only 0 realms
And I should be on the realms page
And I should see "These Realms were deleted: testrealm1, testrealm2"
diff --git a/src/features/suggested_deployables.feature
b/src/features/suggested_deployables.feature
index b9feb6e..caf4c18 100644
--- a/src/features/suggested_deployables.feature
+++ b/src/features/suggested_deployables.feature
@@ -43,7 +43,7 @@ Feature: Manage Suggested Deployables
And I am on the suggested deployables page
When I check "testdepl1" suggested deployable
And I check "testdepl2" suggested deployable
- And I press "delete_button"
+ And I press "multidelete_button"
Then there should be only 0 suggested deployables
And I should be on the suggested deployables page
And I should not see "testdepl1"
diff --git a/src/public/javascripts/application.js
b/src/public/javascripts/application.js
index 1265923..a698a24 100644
--- a/src/public/javascripts/application.js
+++ b/src/public/javascripts/application.js
@@ -154,7 +154,7 @@ var Conductor = {
},
multiDestroyValidation: function() {
- $('#delete_button').live('click', function(e) {
+ $('#multidelete_button').live('click', function(e) {
if ($(".checkbox_table input[@type=radio]:checked").length == 0) {
alert('Please make a selection before clicking Delete button.');
e.preventDefault();
--
1.7.4.4