From: Jan Provaznik jprovazn@redhat.com
Tabs in provider show view are apparently not used anymore. https://www.aeolusproject.org/redmine/issues/2060 --- src/app/controllers/providers_controller.rb | 9 +----- src/spec/controllers/provider_controller_spec.rb | 34 ---------------------- 2 files changed, 1 insertions(+), 42 deletions(-) delete mode 100644 src/app/views/providers/_hw_profiles.haml delete mode 100644 src/app/views/providers/_realms.haml delete mode 100644 src/spec/controllers/provider_controller_spec.rb
diff --git a/src/app/controllers/providers_controller.rb b/src/app/controllers/providers_controller.rb index 95fbc60..3623575 100644 --- a/src/app/controllers/providers_controller.rb +++ b/src/app/controllers/providers_controller.rb @@ -35,8 +35,6 @@ class ProvidersController < ApplicationController @realm_names = @provider.realms.collect { |r| r.name }
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]
if params.delete :test_provider test_connection(@provider) @@ -45,12 +43,7 @@ class ProvidersController < ApplicationController save_breadcrumb(provider_path(@provider), @provider.name)
respond_to do |format| - format.js do - if params.delete :details_pane - render :partial => 'layouts/details_pane' and return - end - render :partial => @details_tab and return - end + format.js { render :partial => 'properties' } format.html { render :action => 'show' } end end diff --git a/src/app/views/providers/_hw_profiles.haml b/src/app/views/providers/_hw_profiles.haml deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/views/providers/_realms.haml b/src/app/views/providers/_realms.haml deleted file mode 100644 index e69de29..0000000 diff --git a/src/spec/controllers/provider_controller_spec.rb b/src/spec/controllers/provider_controller_spec.rb deleted file mode 100644 index 4591e82..0000000 --- a/src/spec/controllers/provider_controller_spec.rb +++ /dev/null @@ -1,34 +0,0 @@ -require 'spec_helper' - -describe ProvidersController do - - fixtures :all - before(:each) do - @admin_permission = FactoryGirl.create :provider_admin_permission - @provider = @admin_permission.permission_object - @admin = @admin_permission.user - activate_authlogic - end - - it "should provide ui to view hardware profiles" do - UserSession.create(@admin) - provider = @admin_permission.permission_object - - get :show, :id => provider.id, :details_tab => 'hw_profiles' - response.should be_success - assigns[:hardware_profiles].size.should == provider.hardware_profiles.size - response.should render_template("providers/_hw_profiles") - end - - it "should provide ui to view realms" do - UserSession.create(@admin) - provider = @admin_permission.permission_object - - get :show, :id => provider.id, :details_tab => 'realms' - response.should be_success - assigns[:realm_names].size.should == provider.realms.size - response.should render_template("providers/_realms") - end - - -end
aeolus-devel@lists.fedorahosted.org