aeolus-devel December 2011

aeolus-devel@lists.fedorahosted.org

46 participants
235 discussions

[PATCH conductor] Style Image Details' header buttons
by Tomas Sedovic 13 Dec '11

13 Dec '11

From: Tomas Sedovic <tomas(a)sedovic.cz> https://bugzilla.redhat.com/show_bug.cgi?id=760589 --- src/app/stylesheets/layout.scss | 10 ++++++++++ src/app/views/images/show.html.haml | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss index 7e74153..5edf82b 100644 --- a/src/app/stylesheets/layout.scss +++ b/src/app/stylesheets/layout.scss @@ -2692,6 +2692,16 @@ ul.catalog_pretty { /********************************************* Image show view */ /************************************************************************** */ +#obj_actions.images { + #back_to_images { + margin: 0px 10px; + } + + #delete, #new_deployable { + margin-top: -5px; + } +} + .image_builds h1 { padding: 10px; font-size: 16px; diff --git a/src/app/views/images/show.html.haml b/src/app/views/images/show.html.haml index 802a994..ee09306 100644 --- a/src/app/views/images/show.html.haml +++ b/src/app/views/images/show.html.haml @@ -1,12 +1,12 @@ = render :partial => 'layouts/admin_nav' %header.admin-page-header %h1{:class => controller.controller_name}= @image.name - #obj_actions.button-container + #obj_actions.button-container.images =t'return_to' - = link_to t('images.index.images'), images_path + = link_to t('images.index.images'), images_path, :class => 'rounded-link', :id => 'back_to_images' .button-group = button_to t("delete"), image_path((a)image.id), :method => 'delete', :confirm => "Are you sure you want to delete?", :class => 'button danger', :id => 'delete' - = link_to t('.new_deployable_from_image'), new_deployable_path(:create_from_image => @image.id) + = link_to t('.new_deployable_from_image'), new_deployable_path(:create_from_image => @image.id), :class => 'button', :id => 'new_deployable' %section.admin-content-section %header -- 1.7.6.4

1 1

[PATCH audrey] fix for BZ 767202, api version checker always returns true
by Dan Radez 13 Dec '11

13 Dec '11

adding /files to the list of uris the api version checker will check

1 1

[PATCH conductor] Require a template file on the upload page
by Tomas Sedovic 13 Dec '11

13 Dec '11

From: Tomas Sedovic <tomas(a)sedovic.cz> https://bugzilla.redhat.com/show_bug.cgi?id=761134 --- src/app/controllers/images_controller.rb | 4 ++++ src/config/locales/en.yml | 1 + src/features/image.feature | 29 ++++++++++++++++++----------- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/src/app/controllers/images_controller.rb b/src/app/controllers/images_controller.rb index 66acd6d..5cf0994 100644 --- a/src/app/controllers/images_controller.rb +++ b/src/app/controllers/images_controller.rb @@ -109,6 +109,10 @@ class ImagesController < ApplicationController else file = params[:image_file] xml_source = file && file.read + if xml_source.blank? + flash.now[:error] = t('images.flash.error.no_file') + render :new and return + end end begin diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml index 1786fa2..99050d5 100644 --- a/src/config/locales/en.yml +++ b/src/config/locales/en.yml @@ -718,6 +718,7 @@ en: not_found: Image not found error: invalid_url: Could not load the provided URL + no_file: You must specify the template XML file new: new_image: New Image description: diff --git a/src/features/image.feature b/src/features/image.feature index ade5ab2..7cc4a24 100644 --- a/src/features/image.feature +++ b/src/features/image.feature @@ -1,18 +1,25 @@ +Feature: Manage Images + In order to manage my cloud infrastructure + As a user + I want to manage instances + + Background: + Given I am an authorised user + And I am logged in + + Scenario: Uploading a template without specifying the file + Given there is a pool family named "testpoolfamily" + And I am on the pool families page + And I follow "New Image" + Then I should be on the new image page + When I fill in "name" with "my template" + And I press "file_button" + Then I should see "You must specify the template XML file" + # # FIXME - This test is failing, but fixing it requires fixing a larger bug: we don't # use VCR the way we think we do when interacting with iwhd... That's a large can of worms. # - -#Feature: Manage Images -# In order to manage my cloud infrastructure -# As a user -# I want to manage instances - -# Background: -# Given I am an authorised user -# And I am logged in - - # Scenario: Show image details # Given there is an image # And I am on the images page -- 1.7.6.4

2 2

[PATCH conductor] Fixing recognize_path calls when the path contains prefix
by Imre Farkas 13 Dec '11

13 Dec '11

From: Imre Farkas <ifarkas(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=758653 --- src/app/controllers/application_controller.rb | 11 +++++++++++ src/app/controllers/catalogs_controller.rb | 4 +--- src/app/controllers/deployables_controller.rb | 4 +--- src/app/controllers/deployments_controller.rb | 4 +--- .../controllers/hardware_profiles_controller.rb | 4 +--- src/app/controllers/instances_controller.rb | 4 +--- src/app/controllers/pools_controller.rb | 5 +---- .../controllers/provider_accounts_controller.rb | 4 +--- src/app/controllers/realms_controller.rb | 4 +--- src/app/controllers/users_controller.rb | 4 +--- 10 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 16fa71d..df2a0fc 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -349,4 +349,15 @@ class ApplicationController < ActionController::Base (ordered_languages & I18n.available_locales).first end + + def redirect_to_original(extended_params = {}) + original_path = params[:current_path] + # In cases when current_path contains prefix like '/conductor' recognize_path fails. + # It needs to be stripped out in order to get the path correctly. + path = original_path.split(ENV['RAILS_RELATIVE_URL_ROOT']).last + path = Rails.application.routes.recognize_path(path) + original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) + redirect_to path.merge(original_params).merge(extended_params) + end + end diff --git a/src/app/controllers/catalogs_controller.rb b/src/app/controllers/catalogs_controller.rb index c530a6a..1f92d3b 100644 --- a/src/app/controllers/catalogs_controller.rb +++ b/src/app/controllers/catalogs_controller.rb @@ -99,9 +99,7 @@ class CatalogsController < ApplicationController end def filter - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("catalogs_preset_filter" => params[:catalogs_preset_filter], "catalogs_search" => params[:catalogs_search]) + redirect_to_original({"catalogs_preset_filter" => params[:catalogs_preset_filter], "catalogs_search" => params[:catalogs_search]}) end private diff --git a/src/app/controllers/deployables_controller.rb b/src/app/controllers/deployables_controller.rb index 19306d2..f909947 100644 --- a/src/app/controllers/deployables_controller.rb +++ b/src/app/controllers/deployables_controller.rb @@ -187,9 +187,7 @@ class DeployablesController < ApplicationController end def filter - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("catalog_entries_preset_filter" => params[:catalog_entries_preset_filter], "catalog_entries_search" => params[:catalog_entries_search]) + redirect_to_original({"catalog_entries_preset_filter" => params[:catalog_entries_preset_filter], "catalog_entries_search" => params[:catalog_entries_search]}) end def build diff --git a/src/app/controllers/deployments_controller.rb b/src/app/controllers/deployments_controller.rb index ebaaf7a..3ca38c3 100644 --- a/src/app/controllers/deployments_controller.rb +++ b/src/app/controllers/deployments_controller.rb @@ -317,9 +317,7 @@ class DeploymentsController < ApplicationController end def filter - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("deployments_preset_filter" => params[:deployments_preset_filter], "deployments_search" => params[:deployments_search]) + redirect_to_original({"deployments_preset_filter" => params[:deployments_preset_filter], "deployments_search" => params[:deployments_search]}) end private diff --git a/src/app/controllers/hardware_profiles_controller.rb b/src/app/controllers/hardware_profiles_controller.rb index e490adb..8773d6a 100644 --- a/src/app/controllers/hardware_profiles_controller.rb +++ b/src/app/controllers/hardware_profiles_controller.rb @@ -150,9 +150,7 @@ class HardwareProfilesController < ApplicationController end def filter - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("hardware_profiles_preset_filter" => params[:hardware_profiles_preset_filter], "hardware_profiles_search" => params[:hardware_profiles_search]) + redirect_to_original({"hardware_profiles_preset_filter" => params[:hardware_profiles_preset_filter], "hardware_profiles_search" => params[:hardware_profiles_search]}) end private diff --git a/src/app/controllers/instances_controller.rb b/src/app/controllers/instances_controller.rb index 9ae96a2..5979a1c 100644 --- a/src/app/controllers/instances_controller.rb +++ b/src/app/controllers/instances_controller.rb @@ -179,9 +179,7 @@ class InstancesController < ApplicationController end def filter - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("instances_preset_filter" => params[:instances_preset_filter], "instances_search" => params[:instances_search]) + redirect_to_original({"instances_preset_filter" => params[:instances_preset_filter], "instances_search" => params[:instances_search]}) end private diff --git a/src/app/controllers/pools_controller.rb b/src/app/controllers/pools_controller.rb index 3918d14..7e4503a 100644 --- a/src/app/controllers/pools_controller.rb +++ b/src/app/controllers/pools_controller.rb @@ -234,10 +234,7 @@ class PoolsController < ApplicationController end def filter - #redirects to path of the table view medged with filter and search params - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("pools_preset_filter" => params[:pools_preset_filter], "pools_search" => params[:pools_search]) + redirect_to_original({"pools_preset_filter" => params[:pools_preset_filter], "pools_search" => params[:pools_search]}) end protected diff --git a/src/app/controllers/provider_accounts_controller.rb b/src/app/controllers/provider_accounts_controller.rb index 43bcd86..d66a6d5 100644 --- a/src/app/controllers/provider_accounts_controller.rb +++ b/src/app/controllers/provider_accounts_controller.rb @@ -184,9 +184,7 @@ class ProviderAccountsController < ApplicationController end def filter - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("provider_accounts_preset_filter" => params[:provider_accounts_preset_filter], "provider_accounts_search" => params[:provider_accounts_search]) + redirect_to_original({"provider_accounts_preset_filter" => params[:provider_accounts_preset_filter], "provider_accounts_search" => params[:provider_accounts_search]}) end protected diff --git a/src/app/controllers/realms_controller.rb b/src/app/controllers/realms_controller.rb index 4b0ef96..c0e01d4 100644 --- a/src/app/controllers/realms_controller.rb +++ b/src/app/controllers/realms_controller.rb @@ -129,9 +129,7 @@ class RealmsController < ApplicationController end def filter - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("realms_preset_filter" => params[:realms_preset_filter], "realms_search" => params[:realms_search]) + redirect_to_original({"realms_preset_filter" => params[:realms_preset_filter], "realms_search" => params[:realms_search]}) end protected diff --git a/src/app/controllers/users_controller.rb b/src/app/controllers/users_controller.rb index d9cf8c9..0af28e7 100644 --- a/src/app/controllers/users_controller.rb +++ b/src/app/controllers/users_controller.rb @@ -135,9 +135,7 @@ class UsersController < ApplicationController end def filter - original_path = Rails.application.routes.recognize_path(params[:current_path]) - original_params = Rack::Utils.parse_nested_query(URI.parse(params[:current_path]).query) - redirect_to original_path.merge(original_params).merge("users_preset_filter" => params[:users_preset_filter], "users_search" => params[:users_search]) + redirect_to_original({"users_preset_filter" => params[:users_preset_filter], "users_search" => params[:users_search]}) end protected -- 1.7.6.4

2 2

[PATCH configure] Regenerate conductor secret_token.rb file each time configure is executed
by Richard Su 13 Dec '11

13 Dec '11

In a follow-on patch, the secret_token.rb file will be removed from the conductor rpm to remove a security hole. Thanks to matty_dubs for pointing this out. --- bin/aeolus-configure | 1 + recipes/aeolus/manifests/conductor.pp | 7 ++++++- recipes/aeolus/templates/secret_token.rb | 21 +++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletions(-) create mode 100644 recipes/aeolus/templates/secret_token.rb diff --git a/bin/aeolus-configure b/bin/aeolus-configure index a1a59a0..9b57b99 100755 --- a/bin/aeolus-configure +++ b/bin/aeolus-configure @@ -67,6 +67,7 @@ echo "Launching aeolus configuration recipe..." export FACTER_AEOLUS_ENABLE_HTTPS=true export FACTER_AEOLUS_ENABLE_SECURITY=false +export FACTER_RAILS_TOKEN=`</dev/urandom tr -dc a-f0-9 | head -c128` NODE_ARRAY=(`echo $PUPPET_NODE | tr "," "\n"`) for x in "${NODE_ARRAY[@]}" diff --git a/recipes/aeolus/manifests/conductor.pp b/recipes/aeolus/manifests/conductor.pp index aa56331..3eba07f 100644 --- a/recipes/aeolus/manifests/conductor.pp +++ b/recipes/aeolus/manifests/conductor.pp @@ -27,6 +27,10 @@ class aeolus::conductor inherits aeolus { content => template("aeolus/conductor-settings.yml"), require => Package['aeolus-conductor']} + file{"/usr/share/aeolus-conductor/config/initializers/secret_token.rb": + content => template("aeolus/secret_token.rb"), + require => Package['aeolus-conductor']} + file{"/rsyslog": ensure => 'directory' } file{"/rsyslog/work": ensure => 'directory', @@ -65,7 +69,8 @@ class aeolus::conductor inherits aeolus { Rails::Migrate::Db[migrate_aeolus_database], Service['httpd'], Apache::Site[aeolus-conductor], Exec[reload-apache], - File['/usr/share/aeolus-conductor/config/settings.yml']] } + File['/usr/share/aeolus-conductor/config/settings.yml'], + File['/usr/share/aeolus-conductor/config/initializers/secret_token.rb']] } ### Initialize and start the aeolus database # Right now we configure and start postgres, at some point I want diff --git a/recipes/aeolus/templates/secret_token.rb b/recipes/aeolus/templates/secret_token.rb new file mode 100644 index 0000000..30e8161 --- /dev/null +++ b/recipes/aeolus/templates/secret_token.rb @@ -0,0 +1,21 @@ +# Copyright 2011 Red Hat, Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Be sure to restart your server when you modify this file. + +# Your secret key for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +Conductor::Application.config.secret_token = '<%= rails_token %>' -- 1.7.6.4

2 2

[PATCH conductor] Don't display 'Download key' if there is not instance key
by Jan Provazník 13 Dec '11

13 Dec '11

From: Jan Provaznik <jprovazn(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=761088 --- .../views/deployments/_pretty_view_show.html.haml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/views/deployments/_pretty_view_show.html.haml b/src/app/views/deployments/_pretty_view_show.html.haml index c4bf681..f7ceade 100644 --- a/src/app/views/deployments/_pretty_view_show.html.haml +++ b/src/app/views/deployments/_pretty_view_show.html.haml @@ -15,8 +15,9 @@ %li %dt.state= t('deployments.pretty_view_show.state') %dd= instance.state - %li - = link_to t('deployments.pretty_view_show.download_key'), key_instance_path(instance) + - if instance.instance_key + %li + = link_to t('deployments.pretty_view_show.download_key'), key_instance_path(instance) %hr .actions %ul -- 1.7.6

1 1

[PATCH conductor] Fixed sort column
by Jan Provazník 13 Dec '11

13 Dec '11

From: Jan Provaznik <jprovazn(a)redhat.com> https://bugzilla.redhat.com/show_bug.cgi?id=761504 sort_column method now includes table name, this was problem for non-admin users - selects were joined with columns from privilege table which contains 'name' column too so there was conflict with default sort column 'name'. Also removed pagination from listing pool families - pagination is obviusly not used in a view and privilege target_type changed to 'Pool' when listing pool families for a user. --- src/app/controllers/application_controller.rb | 5 ++- .../controllers/hardware_profiles_controller.rb | 2 +- src/app/controllers/pool_families_controller.rb | 7 +--- src/features/pool_family.feature | 37 ++++++++++++++----- src/features/step_definitions/pool_family_steps.rb | 5 +++ src/spec/factories/permission.rb | 6 +++ src/spec/factories/user.rb | 3 ++ 7 files changed, 47 insertions(+), 18 deletions(-) diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb index 16fa71d..62ee98a 100644 --- a/src/app/controllers/application_controller.rb +++ b/src/app/controllers/application_controller.rb @@ -272,8 +272,9 @@ class ApplicationController < ActionController::Base end end - def sort_column(model, default="name") - model.column_names.include?(params[:order_field]) ? params[:order_field] : default + def sort_column(model, default = nil) + return params[:order_field] if model.column_names.include?(params[:order_field]) + return default || "#{model.quoted_table_name}.name" end def sort_direction diff --git a/src/app/controllers/hardware_profiles_controller.rb b/src/app/controllers/hardware_profiles_controller.rb index e490adb..62b2056 100644 --- a/src/app/controllers/hardware_profiles_controller.rb +++ b/src/app/controllers/hardware_profiles_controller.rb @@ -207,7 +207,7 @@ class HardwareProfilesController < ApplicationController def load_hardware_profiles sort_order = sort_direction - sort_field = sort_column(HardwareProfile) + sort_field = sort_column(HardwareProfile, 'name') if sort_field == "name" @hardware_profiles = HardwareProfile.list_for_user(current_user, Privilege::VIEW).where('provider_id IS NULL', {}).apply_filters(:preset_filter_id => params[:hardware_profiles_preset_filter], :search_filter => params[:hardware_profiles_search]).order("hardware_profiles.name #{sort_direction}") else diff --git a/src/app/controllers/pool_families_controller.rb b/src/app/controllers/pool_families_controller.rb index 7823c7e..7a109df 100644 --- a/src/app/controllers/pool_families_controller.rb +++ b/src/app/controllers/pool_families_controller.rb @@ -19,14 +19,13 @@ require 'will_paginate/array' class PoolFamiliesController < ApplicationController before_filter :require_user before_filter :set_params_and_header, :only => [:index, :show] - before_filter :load_pool_families, :only =>[:show] + before_filter :load_pool_families, :only =>[:index, :show] before_filter :load_tab_captions_and_details_tab, :only => [:show] def index clear_breadcrumbs save_breadcrumb(pool_families_path) set_admin_environments_tabs 'pool_families' - load_pool_families respond_to do |format| format.html format.js { render :partial => 'list' } @@ -213,9 +212,7 @@ class PoolFamiliesController < ApplicationController end def load_pool_families - @pool_families = PoolFamily.list_for_user(current_user, Privilege::VIEW).paginate( - :page => params[:page] || 1, - :order => (sort_column(PoolFamily) + ' ' + sort_direction)) + @pool_families = PoolFamily.list_for_user(current_user, Privilege::VIEW, Pool).order(sort_column(PoolFamily) + ' ' + sort_direction) end def load_pool_family_tabs diff --git a/src/features/pool_family.feature b/src/features/pool_family.feature index a14767b..8dabd87 100644 --- a/src/features/pool_family.feature +++ b/src/features/pool_family.feature @@ -3,12 +3,10 @@ Feature: Pool Families As a user I want to manage pool families - Background: + Scenario: List pool families Given I am an authorised user And I am logged in - - Scenario: List pool families - Given I am on the homepage + And I am on the homepage And there are these pool families: | name | | pool_family1 | @@ -20,14 +18,25 @@ Feature: Pool Families | pool_family2 | | pool_family3 | + Scenario: List pool families as unprivileged user + Given I am logged in + And I can view pool family "testpoolfamily" + When I go to the pool families page + Then I should see "Pool Families" + And I should see "testpoolfamily" + Scenario: Show pool family details - Given there is a pool family named "testpoolfamily" + Given I am an authorised user + And I am logged in + And there is a pool family named "testpoolfamily" And I am on the pool families page When I follow "testpoolfamily" Then I should see "Pools" Scenario: Create a new Pool family - Given I am on the pool families page + Given I am an authorised user + And I am logged in + And I am on the pool families page And there is not a pool family named "testpoolfamily" When I follow "new_pool_family_button" Then I should be on the new pool family page @@ -39,7 +48,9 @@ Feature: Pool Families And I should have a pool family named "testpoolfamily" Scenario: Delete a pool family - Given I am on the homepage + Given I am an authorised user + And I am logged in + And I am on the homepage And there is a pool family named "poolfamily1" When I go to the pool families page And I follow "poolfamily1" @@ -47,7 +58,9 @@ Feature: Pool Families 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 + Given I am an authorised user + And I am logged in + And I am on the pool families page Then I should see "default" When I follow "default" And I press "delete_pool_family_button" @@ -81,7 +94,9 @@ Feature: Pool Families # And I should see "third_family" Scenario: Add provider account to pool family - Given there is a pool family named "testpoolfamily" + Given I am an authorised user + And I am logged in + And there is a pool family named "testpoolfamily" And there is a provider named "testprovider" And there is a provider account named "testaccount" And I am on the pool family provider accounts page @@ -93,7 +108,9 @@ Feature: Pool Families And I should see "testaccount" Scenario: Remove provider account from pool family - Given there is a pool family named "testpoolfamily" + Given I am an authorised user + And I am logged in + And there is a pool family named "testpoolfamily" And there is a provider named "testprovider" And there is a provider account named "testaccount" And there is a provider account "testaccount" related to pool family "testpoolfamily" diff --git a/src/features/step_definitions/pool_family_steps.rb b/src/features/step_definitions/pool_family_steps.rb index 48de421..82a1645 100644 --- a/src/features/step_definitions/pool_family_steps.rb +++ b/src/features/step_definitions/pool_family_steps.rb @@ -61,3 +61,8 @@ Then /^there should not exist a provider account assigned to "([^"]*)"$/ do |nam @pool_family = PoolFamily.find_by_name(name) @pool_family.provider_accounts.count == 0 end + +Given /^I can view pool family "([^"]*)"$/ do |arg1| + pool_family = PoolFamily.find_by_name(arg1) || FactoryGirl.create(:pool_family, :name => arg1) + perm = FactoryGirl.create(:pool_family_user_permission, :permission_object => pool_family, :user => @user) +end diff --git a/src/spec/factories/permission.rb b/src/spec/factories/permission.rb index d69930a..1a1f025 100644 --- a/src/spec/factories/permission.rb +++ b/src/spec/factories/permission.rb @@ -50,4 +50,10 @@ FactoryGirl.define do user { |r| r.association(:pool_user2) } end + factory :pool_family_user_permission, :parent => :permission do + role { |r| Role.first(:conditions => ['name = ?', 'Pool Family User']) || FactoryGirl.create(:role, :name => 'Pool Family User') } + permission_object { |r| r.association(:pool_family) } + user { |r| r.association(:pool_family_user) } + end + end diff --git a/src/spec/factories/user.rb b/src/spec/factories/user.rb index b5e1369..5ca512d 100644 --- a/src/spec/factories/user.rb +++ b/src/spec/factories/user.rb @@ -58,4 +58,7 @@ FactoryGirl.define do sequence(:login) { |n| "pool_user2#{n}" } end + factory :pool_family_user, :parent => :user do + sequence(:login) { |n| "pool_family_user#{n}" } + end end -- 1.7.6

1 0

[PATCH conductor] Input validation for new deployable from image
by Tomas Sedovic 13 Dec '11

13 Dec '11

From: Tomas Sedovic <tomas(a)sedovic.cz> https://bugzilla.redhat.com/show_bug.cgi?id=761096 When no catalog was selected on the Create Deployable from Image page, the controller called `Catalog.find(nil)` which returned `ActiveRecord::RecordNotFound` error which in turn caused the unexpected redirect. --- src/app/controllers/deployables_controller.rb | 2 +- .../views/deployables/_new_from_image.html.haml | 5 ----- 2 files changed, 1 insertions(+), 6 deletions(-) diff --git a/src/app/controllers/deployables_controller.rb b/src/app/controllers/deployables_controller.rb index f5a894d..3f6116a 100644 --- a/src/app/controllers/deployables_controller.rb +++ b/src/app/controllers/deployables_controller.rb @@ -87,7 +87,7 @@ class DeployablesController < ApplicationController require_privilege(Privilege::CREATE, Deployable) @deployable = Deployable.new(params[:deployable]) - @selected_catalogs = Catalog.find(params[:catalog_id]).to_a + @selected_catalogs = Catalog.find(params[:catalog_id] || []).to_a @deployable.owner = current_user if params.has_key? :url diff --git a/src/app/views/deployables/_new_from_image.html.haml b/src/app/views/deployables/_new_from_image.html.haml index b8030be..c2114ee 100644 --- a/src/app/views/deployables/_new_from_image.html.haml +++ b/src/app/views/deployables/_new_from_image.html.haml @@ -17,7 +17,6 @@ .clear %div = form.label :catalog_id, t('catalog_entries.form.catalog') - /= form.select :catalog_id, @catalogs.collect{|c| [c.name, c.id]} %span.text_instead_input= @selected_catalogs.empty? ? t('deployables.form.none') : @selected_catalogs.count > 1 ? t('deployables.form.multiple') : @selected_catalogs.first.name %span.catalog_link &nbsp @@ -34,7 +33,3 @@ %fieldset.align-center = link_to "#{t'catalog_entries.form.cancel'}", catalogs_path, :class => 'button danger' = submit_tag "#{t'catalog_entries.form.save'}", :name => 'save', :class => 'button primary', :id => 'save_button' - -:javascript - $(document).ready(function(){ - }); -- 1.7.6.4

2 3

[PATCH conductor] New administer nav icons
by Jirka Tomasek 13 Dec '11

13 Dec '11

This patch implements new icons in administer section navigation

1 2

[PATCH conductor 0/5] Deployable details styles and Images
by Jirka Tomasek 13 Dec '11

13 Dec '11

This patchset implements redmine #2906, #2907, BZ759044

2 7

← Newer
1
...
12
13
14
15
16
17
18
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

aeolus-devel December 2011