deltacloud-devel October 2010

deltacloud-devel@lists.fedorahosted.org

18 participants
204 discussions

Start a nNew thread

BZ634071 Fixed Permission check on Instance Management Page
by Martyn Taylor 14 Oct '10

14 Oct '10

Relates to the my comment on Bugzilla Page for this bug

2 2

Re: [deltacloud-devel] [PATCH aggregator] BZ #641484: [Image Builder Service]: Only one build can run at a time
by lmartinc＠redhat.com 14 Oct '10

14 Oct '10

----- "Jan Provaznik" <jprovazn(a)redhat.com> wrote: > On 10/13/2010 10:43 PM, Jason Guiditta wrote: > > https://bugzilla.redhat.com/show_bug.cgi?id=641484 > > > > The queue was never being processed if there were builds already > > in progress. > > --- > > src/image_builder_service/image_builder_service | 4 ++-- > > 1 files changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/src/image_builder_service/image_builder_service > b/src/image_builder_service/image_builder_service > > index 8093143..a77a2ae 100755 > > --- a/src/image_builder_service/image_builder_service > > +++ b/src/image_builder_service/image_builder_service > > @@ -107,7 +107,7 @@ class ImageBuilderService > > @log.debug "All Incomplete Builds: " + cur_builds.size.to_s > > @log.debug "========================================" > > end > > - cur_builds.size> queue.size ? find_orphaned(cur_builds) : > > + find_orphaned(cur_builds) if cur_builds.size> queue.size > > queue.each {|t| > > build(t) > > } > > @@ -141,7 +141,7 @@ class ImageBuilderService > > > > def find_orphaned(cur_builds) > > cur_builds.delete_if do |b| > > - @activebuilds.size == 0 ? break : > > + break if @activebuilds.size == 0 > > @activebuilds.each do |ab| > > b.build_id.eql?(ab[:build_id]) > > end > > ACK Also ACK with a few comments: 1) Maybe instead of @activebuilds.size == 0 we could write just @activebuilds.empty? (it's faster and more intuitive) 2) Also I see that most of you are using method 'size' extensively, but maybe you could consider using method 'length' instead. Ruby isn't strongly type language and using size on integer can give u accidentally the same results. You can read more about it at Floehoppers blog: http://blog.floehopper.org/articles/2007/08/07/why-array-length-is-better-t… Cherrios, Ladislav

1 0

[PATCH aggregator] BZ #641484: [Image Builder Service]: Only one build can run at a time
by Jason Guiditta 14 Oct '10

14 Oct '10

https://bugzilla.redhat.com/show_bug.cgi?id=641484 The queue was never being processed if there were builds already in progress. --- src/image_builder_service/image_builder_service | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/image_builder_service/image_builder_service b/src/image_builder_service/image_builder_service index 8093143..a77a2ae 100755 --- a/src/image_builder_service/image_builder_service +++ b/src/image_builder_service/image_builder_service @@ -107,7 +107,7 @@ class ImageBuilderService @log.debug "All Incomplete Builds: " + cur_builds.size.to_s @log.debug "========================================" end - cur_builds.size > queue.size ? find_orphaned(cur_builds) : + find_orphaned(cur_builds) if cur_builds.size > queue.size queue.each {|t| build(t) } @@ -141,7 +141,7 @@ class ImageBuilderService def find_orphaned(cur_builds) cur_builds.delete_if do |b| - @activebuilds.size == 0 ? break : + break if @activebuilds.size == 0 @activebuilds.each do |ab| b.build_id.eql?(ab[:build_id]) end -- 1.7.2.3

2 1

[PATCH] Forgotten Timecop gem spec for test env.
by lmartinc＠redhat.com 14 Oct '10

14 Oct '10

I forgot to include in the Timecop-patch the Timecop gem into test env. as dependency. Thanks Tomas S. for pointing this out. :)

2 2

[PATCH] Fix for time problem in our tests. #BUG-640608
by lmartinc＠redhat.com 14 Oct '10

14 Oct '10

This patch is attempt to fix our time problems inside tests. I used TimeCop gem to simplify my work with stubbing Time.now. I like the gem implementation because it doesn't actually stub the Time.now, but extends the Time with freezing and travel methods. Also I believe using sleep() method anywhere is just not way to go. I don't really want to wait all the seconds. ;) There's always better way and tests should be if possible fast.

3 4

Template fixes
by Jan Provazník 13 Oct '10

13 Oct '10

This patchset fixes bugs in template software selection (hope this was last one).

2 4

[PATCH cloud engine] Handle errors when adding a provider gracefully
by Tomas Sedovic 13 Oct '10

13 Oct '10

From: Tomas Sedovic <tsedovic(a)redhat.com> When a user didn't enter a correct URL while adding a new provider, an unintelligible error was displayed and no way to correct it. This fix shown the propper error messages and leaves the user on the 'add provider' form to fix it. --- src/app/controllers/provider_controller.rb | 6 ++- src/app/models/provider.rb | 5 +- src/app/stylesheets/aggregator.scss | 22 +++++----- src/app/views/provider/_form.haml | 62 ++++++++++++++++++++-------- src/app/views/provider/show.haml | 44 +------------------- src/config/locales/en.yml | 2 +- src/config/navigation.rb | 2 +- 7 files changed, 66 insertions(+), 77 deletions(-) diff --git a/src/app/controllers/provider_controller.rb b/src/app/controllers/provider_controller.rb index 5e4d32c..7e7f3e5 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -52,12 +52,14 @@ class ProviderController < ApplicationController def create require_privilege(Privilege::PROVIDER_MODIFY) + @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_MODIFY) @provider = Provider.new(params[:provider]) - if @provider.set_cloud_type && @provider.save && - @provider.populate_hardware_profiles + @provider.set_cloud_type! + if @provider.save && @provider.populate_hardware_profiles flash[:notice] = "Provider added." redirect_to :action => "show", :id => @provider else + flash[:notice] = "Cannot add the provider." render :action => "new" end kick_condor diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index f5701aa..6ec3cc3 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -55,8 +55,9 @@ class Provider < ActiveRecord::Base return self.errors.empty? end - def set_cloud_type - self.cloud_type = connect.driver_name + def set_cloud_type! + deltacloud = connect + self.cloud_type = deltacloud.driver_name unless deltacloud.nil? end def connect diff --git a/src/app/stylesheets/aggregator.scss b/src/app/stylesheets/aggregator.scss index e2b316b..6711ee6 100644 --- a/src/app/stylesheets/aggregator.scss +++ b/src/app/stylesheets/aggregator.scss @@ -839,6 +839,17 @@ fieldset.gap { margin-bottom: 7em; } +.fieldWithErrors { + border: 0; margin: 0; padding: 0; + overflow: visible; + input { + background-color: lighten($errorcl, 45%); + color: $errorcl; + } + label { + color: $errorcl; + } +} /* simple two column label + input pairs */ .dcloud_form { fieldset { @@ -855,17 +866,6 @@ fieldset.gap { display: inline-block; width: 20em; } - .fieldWithErrors { - display: inline-block; - border: 0; margin: 0; padding: 0; - input { - background-color: lighten($errorcl, 45%); - color: $errorcl; - } - label { - color: $errorcl; - } - } } .indented { margin: 10px 0 0; diff --git a/src/app/views/provider/_form.haml b/src/app/views/provider/_form.haml index e338a60..d0d1464 100644 --- a/src/app/views/provider/_form.haml +++ b/src/app/views/provider/_form.haml @@ -1,17 +1,45 @@ -.dcloud_form - = error_messages_for 'provider' - %h2 Add a cloud provider - %br/ - - form_tag :controller => :provider, :action => 'create' do - %ul - %li - %label - Name - %span Provide a descriptive name for this provider connection. - = text_field :provider, :name, :class => "txtfield" - %li - %label - URL - %span Enter the URL of the cloud provider. - = text_field:provider, :url, :class => "txtfield" - = submit_tag "Save", :class => "submit" +- readonly = controller.action_name == 'show' ? true : false +- new_provider = ['new', 'create'].include? controller.action_name += render :partial => 'providers' +#details.grid_13 + %nav.subsubnav + = render_navigation(:level => 4) + - if new_provider + - form_action = 'create' + - elsif controller.action_name == 'edit' + - form_action = 'update' + - form_for @provider, :url => {:controller => :provider, :action => form_action}, :class => "dcloud_form" do |f| + %fieldset + %label.grid_4.alpha.big{ :for => "provider_name" } + = t('.provider_name') + - unless readonly + %span.required + * + %label.grid_5.big{ :for => "provider_url" } + = t('.provider_url') + - unless readonly + %span.required + * + %div.grid_4.omega + = f.error_message_on :url, 'URL ' + = f.error_message_on :name, 'Name ' + = f.text_field :name, :title => t('.provider_name'), :value => (@provider.name if @provider), :disabled => ('disabled' if controller.action_name == 'show'), :class => "clear grid_4 alpha" + = f.text_field :url, :title => t('.provider_url'), :class => 'emailinput', :value => (@provider.url if @provider), :disabled => ('disabled' unless new_provider), :class => "grid_5" + - if controller.action_name == 'edit': + = f.hidden_field :id, :value => @provider.id + .clear.prefix_4.grid_5.suffix_4.alpha.omega + %span + ( + %a{ :href => ''}<> + = t('.test_connection') + ) + - unless readonly + %p.requirement + %span.required + * + \- + = t('.required_field') + - if controller.action_name == 'edit' + %input{ :type => 'submit', :value => t(:save), :name => 'save_provider', :id => 'save_provider' } + - elsif new_provider + %input{ :type => 'submit', :value => t(:add), :name => 'add_provider', :id => 'add_provider' } diff --git a/src/app/views/provider/show.haml b/src/app/views/provider/show.haml index 81e556b..c66fabf 100644 --- a/src/app/views/provider/show.haml +++ b/src/app/views/provider/show.haml @@ -1,43 +1 @@ -- readonly = controller.action_name == 'show' ? true : false -= render :partial => 'providers' -#details.grid_13 - %nav.subsubnav - = render_navigation(:level => 4) - - if controller.action_name == 'new' - - form_action = 'create' - - elsif controller.action_name == 'edit' - - form_action = 'update' - - form_tag :controller => :provider, :action => form_action, :class => "dcloud_form" do - %fieldset - %label.grid_4.alpha.big{ :for => "provider_name" } - = t('.provider_name') - - unless readonly - %span.required - * - %label.grid_5.big{ :for => "provider_url" } - = t('.provider_url') - - unless readonly - %span.required - * - /for error messages - %div.grid_4.omega   - = text_field :provider, :name, :title => t('.provider_name'), :value => (@provider.name if @provider), :disabled => ('disabled' if controller.action_name == 'show'), :class => "clear grid_4 alpha" - = text_field :provider, :url, :title => t('.provider_url'), :class => 'emailinput', :value => (@provider.url if @provider), :disabled => ('disabled' unless controller.action_name == 'new'), :class => "grid_5" - - if controller.action_name == 'edit': - = hidden_field :provider, :id, :value => @provider.id - .clear.prefix_4.grid_5.suffix_4.alpha.omega - %span - ( - %a{ :href => ''}<> - = t('.test_connection') - ) - - unless readonly - %p.requirement - %span.required - * - \- - = t('.required_field') - - if controller.action_name == 'edit' - %input{ :type => 'submit', :value => t(:save), :name => 'save_provider', :id => 'save_provider' } - - elsif controller.action_name == 'new' - %input{ :type => 'submit', :value => t(:add), :name => 'add_provider', :id => 'add_provider' } += render :partial => 'form' diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml index 95b7d13..0d8cc39 100644 --- a/src/config/locales/en.yml +++ b/src/config/locales/en.yml @@ -89,7 +89,7 @@ en: account: Account provider: providers: PROVIDERS - show: + form: provider_name: Provider Name provider_url: Provider URL caution_alt_text: Caution diff --git a/src/config/navigation.rb b/src/config/navigation.rb index 9580396..fdf521a 100644 --- a/src/config/navigation.rb +++ b/src/config/navigation.rb @@ -8,7 +8,7 @@ SimpleNavigation::Configuration.run do |navigation| first_level.item :administration, t(:administration), '#', :class => 'administration' do |second_level| second_level.item :system_settings, t(:system_settings), :controller => 'settings' do |third_level| third_level.item :manage_providers, t(:manage_providers), :controller => 'provider' do |fourth_level| - fourth_level.item :provider_summary, t(:provider_summary), { :controller => 'provider', :action => 'show', :id => (@provider.id if @provider) }, :highlights_on => /\/provider\/(show|edit|new)/ + fourth_level.item :provider_summary, t(:provider_summary), { :controller => 'provider', :action => 'show', :id => (@provider.id if @provider) }, :highlights_on => /\/provider\/(show|edit)/ fourth_level.item :provider_accounts, t(:provider_accounts), { :controller => 'provider', :action => 'accounts', :id => (@provider.id if @provider) }, :highlights_on => /\/provider\/accounts/ fourth_level.item :scheduling_policies, t(:scheduling_policies), '#' fourth_level.item :services_provided, t(:services_provided), '#' -- 1.7.2.3

1 0

[PATCH aggregator] Extended template cuke test
by Jan Provazník 13 Oct '10

13 Oct '10

From: Jan Provaznik <jprovazn(a)redhat.com> Added "delete template" scenario --- src/app/views/templates/_templates.haml | 2 +- src/features/step_definitions/template_steps.rb | 4 ++++ src/features/template.feature | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletions(-) diff --git a/src/app/views/templates/_templates.haml b/src/app/views/templates/_templates.haml index 6587110..6a8d0f0 100644 --- a/src/app/views/templates/_templates.haml +++ b/src/app/views/templates/_templates.haml @@ -17,7 +17,7 @@ - else - @templates.each do |tpl| %tr - %td= check_box_tag 'ids[]', tpl.id + %td= check_box_tag 'ids[]', tpl.id, false, :id => "tpl_id_#{tpl.id}" %td = image_tag "blnk.png", :alt => tpl.platform, :class => "icon platform #{tpl.platform}" = tpl.name diff --git a/src/features/step_definitions/template_steps.rb b/src/features/step_definitions/template_steps.rb index b59808d..340da02 100644 --- a/src/features/step_definitions/template_steps.rb +++ b/src/features/step_definitions/template_steps.rb @@ -61,3 +61,7 @@ end Then /^the page should not contain "([^"]*)" selector$/ do |selector| response.should_not have_selector(selector) end + +When /^I select template "([^"]*)"$/ do |arg1| + check("tpl_id_#{(a)template.id}") +end diff --git a/src/features/template.feature b/src/features/template.feature index 29d963e..d703346 100644 --- a/src/features/template.feature +++ b/src/features/template.feature @@ -42,3 +42,11 @@ Feature: Manage Templates Then I should be on the templates page And I should see "Template saved" And I should see "mocktemplate" + + Scenario: Delete a Template + Given There is a "test_template" template + And I am on the templates page + When I select template "template_template" + And I press "Delete" + Then I should be on the templates page + And I should not see "test_template" -- 1.7.2.3

1 0

[PATCH cloud engine] Handle errors when adding a provider gracefully
by Tomas Sedovic 13 Oct '10

13 Oct '10

From: Tomas Sedovic <tsedovic(a)redhat.com> When a user didn't enter a correct URL while adding a new provider, an unintelligible error was displayed and no way to correct it. This fix shown the propper error messages and leaves the user on the 'add provider' form to fix it. --- src/app/controllers/provider_controller.rb | 6 ++- src/app/models/provider.rb | 5 +- src/app/stylesheets/aggregator.scss | 22 +++++----- src/app/views/provider/_form.haml | 62 ++++++++++++++++++++-------- src/app/views/provider/show.haml | 44 +------------------- src/config/locales/en.yml | 2 +- src/config/navigation.rb | 2 +- 7 files changed, 66 insertions(+), 77 deletions(-) diff --git a/src/app/controllers/provider_controller.rb b/src/app/controllers/provider_controller.rb index 5e4d32c..7e7f3e5 100644 --- a/src/app/controllers/provider_controller.rb +++ b/src/app/controllers/provider_controller.rb @@ -52,12 +52,14 @@ class ProviderController < ApplicationController def create require_privilege(Privilege::PROVIDER_MODIFY) + @providers = Provider.list_for_user(@current_user, Privilege::PROVIDER_MODIFY) @provider = Provider.new(params[:provider]) - if @provider.set_cloud_type && @provider.save && - @provider.populate_hardware_profiles + @provider.set_cloud_type! + if @provider.save && @provider.populate_hardware_profiles flash[:notice] = "Provider added." redirect_to :action => "show", :id => @provider else + flash[:notice] = "Cannot add the provider." render :action => "new" end kick_condor diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb index f5701aa..6ec3cc3 100644 --- a/src/app/models/provider.rb +++ b/src/app/models/provider.rb @@ -55,8 +55,9 @@ class Provider < ActiveRecord::Base return self.errors.empty? end - def set_cloud_type - self.cloud_type = connect.driver_name + def set_cloud_type! + deltacloud = connect + self.cloud_type = deltacloud.driver_name unless deltacloud.nil? end def connect diff --git a/src/app/stylesheets/aggregator.scss b/src/app/stylesheets/aggregator.scss index e2b316b..6a3cd7d 100644 --- a/src/app/stylesheets/aggregator.scss +++ b/src/app/stylesheets/aggregator.scss @@ -839,6 +839,17 @@ fieldset.gap { margin-bottom: 7em; } +.fieldWithErrors { + display: inline-block; + border: 0; margin: 0; padding: 0; + input { + background-color: lighten($errorcl, 45%); + color: $errorcl; + } + label { + color: $errorcl; + } +} /* simple two column label + input pairs */ .dcloud_form { fieldset { @@ -855,17 +866,6 @@ fieldset.gap { display: inline-block; width: 20em; } - .fieldWithErrors { - display: inline-block; - border: 0; margin: 0; padding: 0; - input { - background-color: lighten($errorcl, 45%); - color: $errorcl; - } - label { - color: $errorcl; - } - } } .indented { margin: 10px 0 0; diff --git a/src/app/views/provider/_form.haml b/src/app/views/provider/_form.haml index e338a60..d0d1464 100644 --- a/src/app/views/provider/_form.haml +++ b/src/app/views/provider/_form.haml @@ -1,17 +1,45 @@ -.dcloud_form - = error_messages_for 'provider' - %h2 Add a cloud provider - %br/ - - form_tag :controller => :provider, :action => 'create' do - %ul - %li - %label - Name - %span Provide a descriptive name for this provider connection. - = text_field :provider, :name, :class => "txtfield" - %li - %label - URL - %span Enter the URL of the cloud provider. - = text_field:provider, :url, :class => "txtfield" - = submit_tag "Save", :class => "submit" +- readonly = controller.action_name == 'show' ? true : false +- new_provider = ['new', 'create'].include? controller.action_name += render :partial => 'providers' +#details.grid_13 + %nav.subsubnav + = render_navigation(:level => 4) + - if new_provider + - form_action = 'create' + - elsif controller.action_name == 'edit' + - form_action = 'update' + - form_for @provider, :url => {:controller => :provider, :action => form_action}, :class => "dcloud_form" do |f| + %fieldset + %label.grid_4.alpha.big{ :for => "provider_name" } + = t('.provider_name') + - unless readonly + %span.required + * + %label.grid_5.big{ :for => "provider_url" } + = t('.provider_url') + - unless readonly + %span.required + * + %div.grid_4.omega + = f.error_message_on :url, 'URL ' + = f.error_message_on :name, 'Name ' + = f.text_field :name, :title => t('.provider_name'), :value => (@provider.name if @provider), :disabled => ('disabled' if controller.action_name == 'show'), :class => "clear grid_4 alpha" + = f.text_field :url, :title => t('.provider_url'), :class => 'emailinput', :value => (@provider.url if @provider), :disabled => ('disabled' unless new_provider), :class => "grid_5" + - if controller.action_name == 'edit': + = f.hidden_field :id, :value => @provider.id + .clear.prefix_4.grid_5.suffix_4.alpha.omega + %span + ( + %a{ :href => ''}<> + = t('.test_connection') + ) + - unless readonly + %p.requirement + %span.required + * + \- + = t('.required_field') + - if controller.action_name == 'edit' + %input{ :type => 'submit', :value => t(:save), :name => 'save_provider', :id => 'save_provider' } + - elsif new_provider + %input{ :type => 'submit', :value => t(:add), :name => 'add_provider', :id => 'add_provider' } diff --git a/src/app/views/provider/show.haml b/src/app/views/provider/show.haml index 81e556b..c66fabf 100644 --- a/src/app/views/provider/show.haml +++ b/src/app/views/provider/show.haml @@ -1,43 +1 @@ -- readonly = controller.action_name == 'show' ? true : false -= render :partial => 'providers' -#details.grid_13 - %nav.subsubnav - = render_navigation(:level => 4) - - if controller.action_name == 'new' - - form_action = 'create' - - elsif controller.action_name == 'edit' - - form_action = 'update' - - form_tag :controller => :provider, :action => form_action, :class => "dcloud_form" do - %fieldset - %label.grid_4.alpha.big{ :for => "provider_name" } - = t('.provider_name') - - unless readonly - %span.required - * - %label.grid_5.big{ :for => "provider_url" } - = t('.provider_url') - - unless readonly - %span.required - * - /for error messages - %div.grid_4.omega   - = text_field :provider, :name, :title => t('.provider_name'), :value => (@provider.name if @provider), :disabled => ('disabled' if controller.action_name == 'show'), :class => "clear grid_4 alpha" - = text_field :provider, :url, :title => t('.provider_url'), :class => 'emailinput', :value => (@provider.url if @provider), :disabled => ('disabled' unless controller.action_name == 'new'), :class => "grid_5" - - if controller.action_name == 'edit': - = hidden_field :provider, :id, :value => @provider.id - .clear.prefix_4.grid_5.suffix_4.alpha.omega - %span - ( - %a{ :href => ''}<> - = t('.test_connection') - ) - - unless readonly - %p.requirement - %span.required - * - \- - = t('.required_field') - - if controller.action_name == 'edit' - %input{ :type => 'submit', :value => t(:save), :name => 'save_provider', :id => 'save_provider' } - - elsif controller.action_name == 'new' - %input{ :type => 'submit', :value => t(:add), :name => 'add_provider', :id => 'add_provider' } += render :partial => 'form' diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml index 95b7d13..0d8cc39 100644 --- a/src/config/locales/en.yml +++ b/src/config/locales/en.yml @@ -89,7 +89,7 @@ en: account: Account provider: providers: PROVIDERS - show: + form: provider_name: Provider Name provider_url: Provider URL caution_alt_text: Caution diff --git a/src/config/navigation.rb b/src/config/navigation.rb index 9580396..fdf521a 100644 --- a/src/config/navigation.rb +++ b/src/config/navigation.rb @@ -8,7 +8,7 @@ SimpleNavigation::Configuration.run do |navigation| first_level.item :administration, t(:administration), '#', :class => 'administration' do |second_level| second_level.item :system_settings, t(:system_settings), :controller => 'settings' do |third_level| third_level.item :manage_providers, t(:manage_providers), :controller => 'provider' do |fourth_level| - fourth_level.item :provider_summary, t(:provider_summary), { :controller => 'provider', :action => 'show', :id => (@provider.id if @provider) }, :highlights_on => /\/provider\/(show|edit|new)/ + fourth_level.item :provider_summary, t(:provider_summary), { :controller => 'provider', :action => 'show', :id => (@provider.id if @provider) }, :highlights_on => /\/provider\/(show|edit)/ fourth_level.item :provider_accounts, t(:provider_accounts), { :controller => 'provider', :action => 'accounts', :id => (@provider.id if @provider) }, :highlights_on => /\/provider\/accounts/ fourth_level.item :scheduling_policies, t(:scheduling_policies), '#' fourth_level.item :services_provided, t(:services_provided), '#' -- 1.7.2.3

1 0

[PATCH aggregator] Fixed bug 641938
by Jan Provazník 13 Oct '10

13 Oct '10

From: Jan Provaznik <jprovazn(a)redhat.com> Software selection: when whole group is checked and user unchecks individual packages, these packages are not added. --- src/app/controllers/templates_controller.rb | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/app/controllers/templates_controller.rb b/src/app/controllers/templates_controller.rb index 018c75d..90af41b 100644 --- a/src/app/controllers/templates_controller.rb +++ b/src/app/controllers/templates_controller.rb @@ -92,7 +92,15 @@ class TemplatesController < ApplicationController @repository_manager = RepositoryManager.new @groups = @repository_manager.all_groups(params[:repository]) if params[:add_selected] - params[:groups].to_a.each { |group| @tpl.xml.add_group(group) } + # FIXME: bug 641938: when JS is on and user clicks on group chackbox + # all pkgs in the group are selected, so it's not necessary to add whole + # group. User also can uncheck some individual package in the selected + # group. Note that this behavior differs when JS is off - then packages in + # the group are not checked when whole group is checked, so we keep adding + # whole group in this case :-/. + unless request.xhr? + params[:groups].to_a.each { |group| @tpl.xml.add_group(group) } + end params[:packages].to_a.each { |pkg| @tpl.xml.add_package(pkg) } @tpl.save_xml! end -- 1.7.2.3

1 1

← Newer
1
...
10
11
12
13
14
15
16
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel October 2010