From: Tomas Sedovic <tsedovic(a)redhat.com>
The whole Select All / Select None mechanism had a lot of repetition and
unnecessary code in it.
This makes it a bit cleaner by moving the view code to a partial and removing
the @url_params attribute which is unnecessary and may be well-served by good
ol' params hash.
---
src/app/controllers/deployments_controller.rb | 1 -
.../controllers/hardware_profiles_controller.rb | 4 +---
src/app/controllers/instances_controller.rb | 3 +--
src/app/controllers/pool_families_controller.rb | 4 +---
src/app/controllers/pools_controller.rb | 1 -
.../controllers/provider_accounts_controller.rb | 3 +--
src/app/controllers/providers_controller.rb | 5 +----
src/app/controllers/realms_controller.rb | 4 +---
src/app/controllers/roles_controller.rb | 4 +---
src/app/controllers/users_controller.rb | 3 +--
src/app/views/deployments/_list.haml | 2 +-
src/app/views/hardware_profiles/_list.haml | 9 +++------
src/app/views/layouts/_details_pane.haml | 2 +-
src/app/views/layouts/_select_all_none.haml | 5 +++++
src/app/views/pool_families/_list.haml | 8 ++------
.../views/pool_families/_provider_accounts.haml | 2 +-
src/app/views/provider_accounts/_list.haml | 9 +++------
src/app/views/providers/_list.haml | 8 ++------
src/app/views/realms/_list.haml | 8 ++------
src/app/views/roles/_list.haml | 8 ++------
src/app/views/suggested_deployables/index.haml | 7 +------
src/app/views/users/_list.haml | 6 +-----
22 files changed, 32 insertions(+), 74 deletions(-)
create mode 100644 src/app/views/layouts/_select_all_none.haml
diff --git a/src/app/controllers/deployments_controller.rb
b/src/app/controllers/deployments_controller.rb
index df85e1e..3c60506 100644
--- a/src/app/controllers/deployments_controller.rb
+++ b/src/app/controllers/deployments_controller.rb
@@ -190,7 +190,6 @@ class DeploymentsController < ApplicationController
private
def load_deployments
- @url_params = params
@deployments = Deployment.paginate(:all,
:page => params[:page] || 1,
:order => (params[:order_field] || 'name') +' '+
(params[:order_dir] || 'asc')
diff --git a/src/app/controllers/hardware_profiles_controller.rb
b/src/app/controllers/hardware_profiles_controller.rb
index 9051de8..0929758 100644
--- a/src/app/controllers/hardware_profiles_controller.rb
+++ b/src/app/controllers/hardware_profiles_controller.rb
@@ -46,7 +46,7 @@ class HardwareProfilesController < ApplicationController
respond_to do |format|
format.js do
- if @url_params.delete :details_pane
+ if params.delete :details_pane
render :partial => 'layouts/details_pane' and return
end
render :partial => @details_tab and return
@@ -182,7 +182,6 @@ class HardwareProfilesController < ApplicationController
def setup_hardware_profile
@tab_captions = ['Matched Provider Hardware Profiles']
@details_tab = 'matching_provider_hardware_profiles'
- @url_params = params
@header = [
{ :name => "Name", :sort_attr => :name},
{ :name => "Unit", :sort_attr => :unit},
@@ -190,7 +189,6 @@ class HardwareProfilesController < ApplicationController
end
def set_params_and_header
- @url_params = params
@header = [
{ :name => "Hardware Profile Name", :sort_attr => :name },
{ :name => "Architecture", :sort_attr => :architecture },
diff --git a/src/app/controllers/instances_controller.rb
b/src/app/controllers/instances_controller.rb
index 8053203..fa60438 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -28,13 +28,12 @@ class InstancesController < ApplicationController
def show
load_instances
- @url_params = params.clone
@tab_captions = ['Properties', 'History', 'Permissions']
@details_tab = params[:details_tab].blank? ? 'properties' :
params[:details_tab]
save_breadcrumb(instance_path(@instance), @instance.name)
respond_to do |format|
format.js do
- if @url_params.delete :details_pane
+ if params.delete :details_pane
render :partial => 'layouts/details_pane' and return
end
render :partial => @details_tab and return
diff --git a/src/app/controllers/pool_families_controller.rb
b/src/app/controllers/pool_families_controller.rb
index c8acdc8..03dee90 100644
--- a/src/app/controllers/pool_families_controller.rb
+++ b/src/app/controllers/pool_families_controller.rb
@@ -57,12 +57,11 @@ class PoolFamiliesController < ApplicationController
def show
@pool_family = PoolFamily.find(params[:id])
- @url_params = params.clone
save_breadcrumb(pool_family_path(@pool_family), @pool_family.name)
respond_to do |format|
format.js do
- if @url_params.delete :details_pane
+ if params.delete :details_pane
render :partial => 'layouts/details_pane' and return
end
render :partial => @details_tab and return
@@ -127,7 +126,6 @@ class PoolFamiliesController < ApplicationController
end
def set_params_and_header
- @url_params = params.clone
@header = [{:name => "Name", :sort_attr => :name},
{:name => "Quota limit", :sort_attr => :name},
{:name => "Quota currently in use", :sort_attr => :name},
diff --git a/src/app/controllers/pools_controller.rb
b/src/app/controllers/pools_controller.rb
index 1068bd2..2524beb 100644
--- a/src/app/controllers/pools_controller.rb
+++ b/src/app/controllers/pools_controller.rb
@@ -198,7 +198,6 @@ class PoolsController < ApplicationController
protected
def set_params_and_header
- @url_params = params.clone
@header = [
{ :name => '', :sortable => false },
{ :name => '', :sortable => false },
diff --git a/src/app/controllers/provider_accounts_controller.rb
b/src/app/controllers/provider_accounts_controller.rb
index 710f5d4..a6ba9a9 100644
--- a/src/app/controllers/provider_accounts_controller.rb
+++ b/src/app/controllers/provider_accounts_controller.rb
@@ -41,7 +41,7 @@ class ProviderAccountsController < ApplicationController
respond_to do |format|
format.js do
- if @url_params.delete :details_pane
+ if params.delete :details_pane
render :partial => 'layouts/details_pane' and return
end
render :partial => @details_tab and return
@@ -186,7 +186,6 @@ class ProviderAccountsController < ApplicationController
{ :name => "Username", :sortable => false},
{ :name => "Provider Type", :sortable => false }
]
- @url_params = params
end
def load_accounts
diff --git a/src/app/controllers/providers_controller.rb
b/src/app/controllers/providers_controller.rb
index 7364389..ce736b2 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -40,7 +40,6 @@ class ProvidersController < ApplicationController
@hardware_profiles = @provider.hardware_profiles
@realm_names = @provider.realms.collect { |r| r.name }
- @url_params = params.clone
require_privilege(Privilege::VIEW, @provider)
@tab_captions = ['Properties', 'HW Profiles', 'Realms',
'Provider Accounts', 'Services', 'History',
'Permissions']
@details_tab = params[:details_tab].blank? ? 'properties' :
params[:details_tab]
@@ -53,7 +52,7 @@ class ProvidersController < ApplicationController
respond_to do |format|
format.js do
- if @url_params.delete :details_pane
+ if params.delete :details_pane
render :partial => 'layouts/details_pane' and return
end
render :partial => @details_tab and return
@@ -150,7 +149,6 @@ class ProvidersController < ApplicationController
@header = [{:name => "Provider name", :sort_attr => :name},
{:name => "Provider URL", :sort_attr => :name}
]
- @url_params = params.clone
end
def load_providers
@@ -159,6 +157,5 @@ class ProvidersController < ApplicationController
{:name => "Provider Type", :sort_attr => :name}
]
@providers = Provider.list_for_user(@current_user, Privilege::VIEW)
- @url_params = params.clone
end
end
diff --git a/src/app/controllers/realms_controller.rb
b/src/app/controllers/realms_controller.rb
index 59051fa..a858008 100644
--- a/src/app/controllers/realms_controller.rb
+++ b/src/app/controllers/realms_controller.rb
@@ -90,7 +90,6 @@ class RealmsController < ApplicationController
def show
@realm = FrontendRealm.find(params[:id])
- @url_params = params.clone
@tab_captions = ['Properties', 'Mapping']
@details_tab = params[:details_tab].blank? ? 'properties' :
params[:details_tab]
@@ -101,7 +100,7 @@ class RealmsController < ApplicationController
respond_to do |format|
format.js do
- if @url_params.delete :details_pane
+ if params.delete :details_pane
render :partial => 'layouts/details_pane' and return
end
render :partial => @details_tab
@@ -120,7 +119,6 @@ class RealmsController < ApplicationController
def load_realms
@header = [{:name => "Name", :sort_attr => :name}]
- @url_params = params.clone
@realms = FrontendRealm.all
end
end
diff --git a/src/app/controllers/roles_controller.rb
b/src/app/controllers/roles_controller.rb
index 89968c3..7e5fc38 100644
--- a/src/app/controllers/roles_controller.rb
+++ b/src/app/controllers/roles_controller.rb
@@ -46,13 +46,12 @@ class RolesController < ApplicationController
require_privilege(Privilege::PERM_VIEW)
@role = Role.find(params[:id])
- @url_params = params.clone
@tab_captions = ['Properties']
@details_tab = params[:details_tab].blank? ? 'properties' :
params[:details_tab]
save_breadcrumb(role_path(@role), @role.name)
respond_to do |format|
format.js do
- if @url_params.delete :details_pane
+ if params.delete :details_pane
render :partial => 'layouts/details_pane' and return
end
render :partial => @details_tab
@@ -116,7 +115,6 @@ class RolesController < ApplicationController
@header = [
{ :name => "Role name", :sort_attr => :name }
]
- @url_params = params.clone
end
def load_roles
diff --git a/src/app/controllers/users_controller.rb
b/src/app/controllers/users_controller.rb
index 1b4f7b5..9892b82 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -57,12 +57,11 @@ class UsersController < ApplicationController
require_privilege(Privilege::VIEW, User) unless current_user == @user
@quota_resources = @user.quota.quota_resources
save_breadcrumb(user_path(@user), @user.name)
- @url_params = params.clone
@tab_captions = ['Properties']
@details_tab = params[:details_tab].blank? ? 'properties' :
params[:details_tab]
respond_to do |format|
format.js do
- if @url_params.delete :details_pane
+ if params.delete :details_pane
render :partial => 'layouts/details_pane' and return
end
render :partial => @details_tab
diff --git a/src/app/views/deployments/_list.haml b/src/app/views/deployments/_list.haml
index 7916f3b..e049e96 100644
--- a/src/app/views/deployments/_list.haml
+++ b/src/app/views/deployments/_list.haml
@@ -35,7 +35,7 @@
- @deployments.each do |deployment|
%tr
%td
- - selected = @url_params[:select] == 'all'
+ - selected = params[:select] == 'all'
%input{:name => "deployments_selected[]", :type =>
"checkbox", :value => deployment.id, :id =>
"deployment_checkbox_#{deployment.id}", :checked => selected }
%td
-#there will be icons (belongs to mockups)
diff --git a/src/app/views/hardware_profiles/_list.haml
b/src/app/views/hardware_profiles/_list.haml
index 21fea2f..b7a4322 100644
--- a/src/app/views/hardware_profiles/_list.haml
+++ b/src/app/views/hardware_profiles/_list.haml
@@ -6,11 +6,8 @@
.content
- form_tag multi_destroy_hardware_profiles_path do
= submit_tag "Delete", :id => 'delete_button', :class =>
'button'
- %p
- Select:
- = link_to "All", @url_params.merge(:select => 'all')
- %span> ,
- = link_to "None", @url_params.merge(:select => 'none')
+
+ = render :partial => 'layouts/select_all_none'
%table#hardware_profiles_table.checkbox_table
%thead
@@ -24,7 +21,7 @@
- @hardware_profiles.each do |hwp|
%tr{:class => cycle('stripe')}
%td
- - selected = @url_params[:select] == 'all'
+ - selected = params[:select] == 'all'
= check_box_tag "hardware_profile_selected[]", hwp.id, selected,
:id => "hardware_profile_checkbox_#{hwp.id}"
%td= link_to hwp.name, hardware_profile_path(hwp)
%td= hwp.architecture.to_s
diff --git a/src/app/views/layouts/_details_pane.haml
b/src/app/views/layouts/_details_pane.haml
index 9e895e9..15df7f1 100644
--- a/src/app/views/layouts/_details_pane.haml
+++ b/src/app/views/layouts/_details_pane.haml
@@ -1,7 +1,7 @@
%ul.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header.ui-corner-all
- @tab_captions.each do |tab|
%li.ui-state-default.ui-corner-top{ :class => "#{'ui-tabs-selected
ui-state-active' if @details_tab == slug(tab)}"}
- %a{ :href => url_for(@url_params.merge(:details_tab => slug(tab))), :id =>
"details_#{tab}"}
+ %a{ :href => url_for(params.merge(:details_tab => slug(tab))), :id =>
"details_#{tab}"}
%span
= tab
#details-selected
diff --git a/src/app/views/layouts/_select_all_none.haml
b/src/app/views/layouts/_select_all_none.haml
new file mode 100644
index 0000000..ce2c5e8
--- /dev/null
+++ b/src/app/views/layouts/_select_all_none.haml
@@ -0,0 +1,5 @@
+%p
+ Select:
+ = link_to "All", params.merge(:select => 'all')
+ %span> ,
+ = link_to "None", params.merge(:select => 'none')
diff --git a/src/app/views/pool_families/_list.haml
b/src/app/views/pool_families/_list.haml
index bda57b3..5ada358 100644
--- a/src/app/views/pool_families/_list.haml
+++ b/src/app/views/pool_families/_list.haml
@@ -7,11 +7,7 @@
- form_tag multi_destroy_pool_families_path do
= submit_tag "Delete", :id => 'delete_button', :class =>
'button'
- %p
- Select:
- = link_to "All", @url_params.merge(:select => 'all')
- %span> ,
- = link_to "None", @url_params.merge(:select => 'none')
+ = render :partial => 'layouts/select_all_none'
%table#pool_families_table.checkbox_table
%thead
@@ -24,7 +20,7 @@
- @pool_families.each do |pool_family|
%tr{:class => cycle('stripe')}
%td
- - selected = @url_params[:select] == 'all'
+ - selected = params[:select] == 'all'
= check_box_tag "pool_family_selected[]", pool_family.id,
selected, :id => "pool_family_checkbox_#{pool_family.id}"
%td= link_to pool_family.name, pool_family_path(pool_family)
%td= pool_family.quota.maximum_running_instances or 'unlimited'
diff --git a/src/app/views/pool_families/_provider_accounts.haml
b/src/app/views/pool_families/_provider_accounts.haml
index af87341..ea21e4d 100644
--- a/src/app/views/pool_families/_provider_accounts.haml
+++ b/src/app/views/pool_families/_provider_accounts.haml
@@ -12,7 +12,7 @@
- @pool_family.provider_accounts.each do |provider_account|
%tr
%td
- - selected = @url_params[:select_provider_accounts] == 'all'
+ - selected = params[:select_provider_accounts] == 'all'
%input{:name => "provider_account_selected[]", :type =>
"checkbox", :value => provider_account.id, :id =>
"provider_account_checkbox_#{provider_account.id}", :checked => selected }
= provider_account.name
diff --git a/src/app/views/provider_accounts/_list.haml
b/src/app/views/provider_accounts/_list.haml
index 045bb04..214f7be 100644
--- a/src/app/views/provider_accounts/_list.haml
+++ b/src/app/views/provider_accounts/_list.haml
@@ -6,11 +6,8 @@
.content
- form_tag multi_destroy_provider_accounts_path do
= submit_tag "Delete", :id => 'delete_button', :class =>
'button'
- %p
- Select:
- = link_to "All", @url_params.merge(:select => 'all')
- %span> ,
- = link_to "None", @url_params.merge(:select => 'none')
+
+ = render :partial => 'layouts/select_all_none'
%table#provider_accounts_table.checkbox_table
%thead
@@ -22,7 +19,7 @@
- @accounts.each do |account|
%tr
%td
- - selected = @url_params[:select] == 'all'
+ - selected = params[:select] == 'all'
= check_box_tag "accounts_selected[]", account.id, selected, :id
=> "account_checkbox_#{account.id}"
%td= link_to account.name, provider_account_path(account)
%td= account.credentials_hash['username']
diff --git a/src/app/views/providers/_list.haml b/src/app/views/providers/_list.haml
index 90aafd9..8d0d25d 100644
--- a/src/app/views/providers/_list.haml
+++ b/src/app/views/providers/_list.haml
@@ -7,11 +7,7 @@
- form_tag multi_destroy_providers_path do
= submit_tag "Delete", :id => 'delete_button', :class =>
'button danger'
- %p
- Select:
- = link_to "All", @url_params.merge(:select => 'all')
- %span> ,
- = link_to "None", @url_params.merge(:select => 'none')
+ = render :partial => 'layouts/select_all_none'
%table#providers_table.checkbox_table
%thead
@@ -23,7 +19,7 @@
- @providers.each do |provider|
%tr{:class => cycle('stripe')}
%td
- - selected = @url_params[:select] == 'all'
+ - selected = params[:select] == 'all'
= check_box_tag "provider_selected[]", provider.id, selected, :id
=> "provider_checkbox_#{provider.id}"
%td= link_to provider.name, provider_path(provider)
%td= provider.url
diff --git a/src/app/views/realms/_list.haml b/src/app/views/realms/_list.haml
index fae6021..94b0ca6 100644
--- a/src/app/views/realms/_list.haml
+++ b/src/app/views/realms/_list.haml
@@ -7,11 +7,7 @@
- form_tag multi_destroy_realms_path do
= submit_tag "Delete", :id => 'delete_button', :class =>
'button'
- %p
- Select:
- = link_to "All", @url_params.merge(:select => 'all')
- %span> ,
- = link_to "None", @url_params.merge(:select => 'none')
+ = render :partial => 'layouts/select_all_none'
%table#realms_table.checkbox_table
%thead
@@ -22,6 +18,6 @@
- @realms.each do |realm|
%tr{:class => cycle('stripe')}
%td
- - selected = @url_params[:select] == 'all'
+ - selected = params[:select] == 'all'
= check_box_tag "realm_selected[]", realm.id, selected, :id
=> "realm_checkbox_#{realm.id}"
%td= link_to realm.name, realm_path(realm)
diff --git a/src/app/views/roles/_list.haml b/src/app/views/roles/_list.haml
index 6d08325..dc7251b 100644
--- a/src/app/views/roles/_list.haml
+++ b/src/app/views/roles/_list.haml
@@ -6,12 +6,8 @@
.content
- form_tag multi_destroy_roles_path do
= submit_tag "Delete", :id => 'delete_button', :class =>
'button'
- %p
- Select:
- = link_to "All", @url_params.merge(:select => 'all')
- %span> ,
- = link_to "None", @url_params.merge(:select => 'none')
+ = render :partial => 'layouts/select_all_none'
%table#roles_table.checkbox_table
%thead
%tr
@@ -20,6 +16,6 @@
- @roles.each do |role|
%tr{:class => cycle('stripe')}
%td
- - selected = @url_params[:select] == 'all'
+ - selected = params[:select] == 'all'
= check_box_tag "role_selected[]", role.id, selected, :id =>
"role_checkbox_#{role.id}"
%td= link_to role.name, role_path(role)
diff --git a/src/app/views/suggested_deployables/index.haml
b/src/app/views/suggested_deployables/index.haml
index 6c1c4e3..3a43440 100644
--- a/src/app/views/suggested_deployables/index.haml
+++ b/src/app/views/suggested_deployables/index.haml
@@ -10,12 +10,7 @@
- form_header = capture_haml do
= restful_submit_tag "Delete", "destroy",
multi_destroy_suggested_deployables_path, 'DELETE', :id =>
'delete_button', :class => 'button danger'
- %p
- Select:
- = link_to "All", params.merge(:select => 'all')
- %span> ,
- = link_to "None", params.merge(:select => 'none')
-
+ = render :partial => 'layouts/select_all_none'
= filter_table(@header, @suggested_deployables, :form_header => form_header) do
|deployable|
%table#deployables_table.checkbox_table
%tr
diff --git a/src/app/views/users/_list.haml b/src/app/views/users/_list.haml
index 540fdab..69a9c06 100644
--- a/src/app/views/users/_list.haml
+++ b/src/app/views/users/_list.haml
@@ -7,11 +7,7 @@
- form_tag multi_destroy_users_path do
= submit_tag "Delete", :id => 'delete_button', :class =>
'button danger'
- %p
- Select:
- = link_to "All", params.merge(:select => 'all')
- %span> ,
- = link_to "None", params.merge(:select => 'none')
+ = render :partial => 'layouts/select_all_none'
%table#users_table.checkbox_table
%thead
--
1.7.4.4