[PATCH conductor 04/11] valdate :details_tab param against valid values before passing into render
Mo Morsi
mmorsi at redhat.com
Thu Jun 21 20:51:52 UTC 2012
From: mmorsi <mmorsi at redhat.com>
---
.../controllers/hardware_profiles_controller.rb | 2 ++
src/app/controllers/instances_controller.rb | 2 ++
src/app/controllers/providers_controller.rb | 4 ++++
src/app/controllers/users_controller.rb | 2 +-
4 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/app/controllers/hardware_profiles_controller.rb b/src/app/controllers/hardware_profiles_controller.rb
index 2b91d5d..94588a9 100644
--- a/src/app/controllers/hardware_profiles_controller.rb
+++ b/src/app/controllers/hardware_profiles_controller.rb
@@ -53,6 +53,8 @@ class HardwareProfilesController < ApplicationController
@tab_captions = [t('hardware_profiles.tab_captions.properties'), t('hardware_profiles.tab_captions.history'), t('hardware_profiles.tab_captions.matching_provider_hwp')]
@details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
properties
+ @details_tab = 'properties' unless['properties', 'history',
+ 'matching_provider_hardware_profiles'].include?(@details_tab)
find_matching_provider_hardware_profiles
save_breadcrumb(hardware_profile_path(@hardware_profile), @hardware_profile.name)
diff --git a/src/app/controllers/instances_controller.rb b/src/app/controllers/instances_controller.rb
index 110f1d2..b9031bd 100644
--- a/src/app/controllers/instances_controller.rb
+++ b/src/app/controllers/instances_controller.rb
@@ -48,6 +48,8 @@ class InstancesController < ApplicationController
save_breadcrumb(instance_path(@instance), @instance.name)
@events = @instance.events.paginate(:page => params[:page] || 1)
@view = params[:details_tab].blank? ? 'properties' : params[:details_tab]
+ @details_tab = 'properties' unless ['properties', 'history',
+ 'parameters', 'permissions'].include?(@details_tab)
@tabs = [
{:name => t('properties'), :view => @view, :id => 'properties'},
{:name => t('instances.parameters.config_parameters'), :view => 'parameters', :id => 'parameters'},
diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb
index ce6b91a..81ac69f 100644
--- a/src/app/controllers/providers_controller.rb
+++ b/src/app/controllers/providers_controller.rb
@@ -83,6 +83,9 @@ class ProvidersController < ApplicationController
require_privilege(Privilege::VIEW, @provider)
@tab_captions = [t("properties"), t('hw_profiles'), t('realm_s'), t("provider_accounts.index.provider_accounts"), t('services'), t('history'), t('permissions')]
@details_tab = params[:details_tab].blank? ? t("properties") : params[:details_tab]
+ @details_tab = 'properties' unless ['properties', 'hw_profiles', 'realms',
+ 'provider_accounts', 'services', 'history',
+ 'permissions'].include?(@details_tab)
if params.delete :test_provider
test_connection(@provider)
@@ -305,6 +308,7 @@ class ProvidersController < ApplicationController
]
add_permissions_tab(@provider, "edit_")
details_tab_name = params[:details_tab].blank? ? 'connectivity' : params[:details_tab]
+ details_tab_name = 'connectivity' unless ['connectivity', 'accounts', 'realms'].include?(details_tab_name)
@details_tab = @tabs.find {|t| t[:id] == details_tab_name} || @tabs.first[:name].downcase
if @details_tab[:id] == 'accounts'
diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb
index 010ebe1..d726370 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -72,7 +72,7 @@ class UsersController < ApplicationController
@quota_resources = @user.quota.quota_resources
save_breadcrumb(user_path(@user), @user.name)
@tab_captions = ['Properties']
- @details_tab = params[:details_tab].blank? ? 'properties' : params[:details_tab]
+ @details_tab = 'properties' # currently the only supported details tab
respond_to do |format|
format.html
format.js do
--
1.7.6.5
More information about the aeolus-devel
mailing list