October 2010 - deltacloud-devel - Fedora Mailing-Lists

[PATCH] Make sure all of our services use DCLOUD_USER.

by Chris Lalancette

This is the same problem I fixed earlier for the aggregator, just applied to all of our daemons. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- conf/deltacloud-aggregator | 6 +++--- conf/deltacloud-aggregator.sysconf | 4 ++-- conf/deltacloud-condor_refreshd | 5 ++--- conf/deltacloud-dbomatic | 5 ++--- conf/deltacloud-image_builder_service | 5 ++--- 5 files changed, 11 insertions(+), 14 deletions(-) diff --git a/conf/deltacloud-aggregator b/conf/deltacloud-aggregator index 2fb1bce..d30dc86 100755 --- a/conf/deltacloud-aggregator +++ b/conf/deltacloud-aggregator @@ -17,8 +17,8 @@ DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}" THIN_LOG="${THIN_LOG:-/var/log/deltacloud-aggregator/thin.log}" THIN_PID="${THIN_PID:-/var/run/deltacloud-aggregator/thin.pid}" THIN_LOCKFILE="${THIN_LOCKFILE:-/var/lock/subsys/deltacloud-aggregator }" -THIN_USER="${THIN_USER:-dcloud}" -THIN_GROUP="${THIN_GROUP:-dcloud}" +DCLOUD_USER="${DCLOUD_USER:-dcloud}" +DCLOUD_GROUP="${DCLOUD_GROUP:-dcloud}" PREFIX="${PREFIX:-/deltacloud}" ADAPTER="${ADAPTER:-rails}" @@ -32,7 +32,7 @@ start() { echo -n "Starting deltacloud-aggregator: " $THIN_PROG start -c $DELTACLOUD_DIR -l $THIN_LOG -P $THIN_PID \ - -a $ADDR -e $RAILS_ENV --user $THIN_USER --group $THIN_GROUP \ + -a $ADDR -e $RAILS_ENV --user $DCLOUD_USER --group $DCLOUD_GROUP \ -d --prefix=$PREFIX -A $ADAPTER RETVAL=$? if [ $RETVAL -eq 0 ] && touch $THIN_LOCKFILE ; then diff --git a/conf/deltacloud-aggregator.sysconf b/conf/deltacloud-aggregator.sysconf index 4bf79e9..0959ed1 100644 --- a/conf/deltacloud-aggregator.sysconf +++ b/conf/deltacloud-aggregator.sysconf @@ -11,8 +11,8 @@ #THIN_PID=/var/run/deltacloud-aggregator/thin.pid # user and group under which Rails application runs -#THIN_USER=dcloud -#THIN_GROUP=dcloud +#DCLOUD_USER=dcloud +#DCLOUD_GROUP=dcloud # URL prefix for Rails application #PREFIX=/deltacloud diff --git a/conf/deltacloud-condor_refreshd b/conf/deltacloud-condor_refreshd index 6c0b6d5..c991f37 100755 --- a/conf/deltacloud-condor_refreshd +++ b/conf/deltacloud-condor_refreshd @@ -15,8 +15,7 @@ DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}" REFRESHD_LOG="${REFRESHD_LOG:-/var/log/deltacloud-aggregator/condor_refreshd.log}" REFRESHD_PID="${REFRESHD_PID:-/var/run/deltacloud-aggregator/condor_refreshd.pid}" REFRESHD_LOCKFILE="${REFRESHD_LOCKFILE:-/var/lock/subsys/deltacloud-condor_refreshd}" -USER="${USER:-dcloud}" -GROUP="${GROUP:-dcloud}" +DCLOUD_USER="${DCLOUD_USER:-dcloud}" REFRESHD_PATH=/usr/share/deltacloud-aggregator/condor_refreshd REFRESHD_PROG=condor_refreshd @@ -27,7 +26,7 @@ REFRESHD_PID=/var/run/deltacloud-aggregator/condor_refreshd.pid start() { echo -n "Starting deltacloud-condor_refreshd: " - daemon --user=$USER $REFRESHD_PATH/$REFRESHD_PROG + daemon --user=$DCLOUD_USER $REFRESHD_PATH/$REFRESHD_PROG RETVAL=$? if [ $RETVAL -eq 0 ] && touch $REFRESHD_LOCKFILE ; then echo_success diff --git a/conf/deltacloud-dbomatic b/conf/deltacloud-dbomatic index 8a50098..782231b 100755 --- a/conf/deltacloud-dbomatic +++ b/conf/deltacloud-dbomatic @@ -15,8 +15,7 @@ DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}" DBOMATIC_LOG="${DBOMATIC_LOG:-/var/log/deltacloud-aggregator/dbomatic.log}" DBOMATIC_PID="${DBOMATIC_PID:-/var/run/deltacloud-aggregator/dbomatic.pid}" DBOMATIC_LOCKFILE="${DBOMATIC_LOCKFILE:-/var/lock/subsys/deltacloud-dbomatic }" -USER="${USER:-dcloud}" -GROUP="${GROUP:-dcloud}" +DCLOUD_USER="${DCLOUD_USER:-dcloud}" DBOMATIC_PATH=/usr/share/deltacloud-aggregator/dbomatic DBOMATIC_PROG=dbomatic @@ -27,7 +26,7 @@ DBOMATIC_PID=/var/run/deltacloud-aggregator/dbomatic.pid start() { echo -n "Starting deltacloud-dbomatic: " - daemon --user=$USER $DBOMATIC_PATH/$DBOMATIC_PROG + daemon --user=$DCLOUD_USER $DBOMATIC_PATH/$DBOMATIC_PROG RETVAL=$? if [ $RETVAL -eq 0 ] && touch $DBOMATIC_LOCKFILE ; then echo_success diff --git a/conf/deltacloud-image_builder_service b/conf/deltacloud-image_builder_service index ecffb43..ee2f4ac 100755 --- a/conf/deltacloud-image_builder_service +++ b/conf/deltacloud-image_builder_service @@ -15,8 +15,7 @@ DELTACLOUD_DIR="${DELTACLOUD_DIR:-/usr/share/deltacloud-aggregator}" BUILDER_LOG="${BUILDER_LOG:-/var/log/deltacloud-aggregator/image_builder_service.log}" BUILDER_PID="${BUILDER_PID:-/var/run/deltacloud-aggregator/image_builder_service.pid}" BUILDER_LOCKFILE="${BUILDER_LOCKFILE:-/var/lock/subsys/deltacloud-image_builder_service}" -USER="${USER:-dcloud}" -GROUP="${GROUP:-dcloud}" +DCLOUD_USER="${DCLOUD_USER:-dcloud}" BUILDER_PATH=/usr/share/deltacloud-aggregator/image_builder_service BUILDER_PROG=image_builder_service @@ -26,7 +25,7 @@ BUILDER_PROG=image_builder_service start() { echo -n "Starting deltacloud-image_builder_service: " - daemon --user=$USER $BUILDER_PATH/$BUILDER_PROG + daemon --user=$DCLOUD_USER $BUILDER_PATH/$BUILDER_PROG RETVAL=$? if [ $RETVAL -eq 0 ] && touch $BUILDER_LOCKFILE ; then echo_success -- 1.7.3.1

13 years, 8 months

2
1
0 / 0

[PATCH aggregator] BZ#643938 Removed automatic user selection on manage users page

by Martyn Taylor

From: martyntaylor <mtaylor(a)redhat.com> --- src/app/views/users/index.haml | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/src/app/views/users/index.haml b/src/app/views/users/index.haml index a26900b..df9def1 100644 --- a/src/app/views/users/index.haml +++ b/src/app/views/users/index.haml @@ -29,8 +29,7 @@ -(a)users.each do |user| %tr %td - - is_first_user = (user == @users.first) - %input{:checked => is_first_user, :name => "user_checkbox", :type => "checkbox", :value => user.id, :id => "user_checkbox_#{user.id}" } + %input{:name => "user_checkbox", :type => "checkbox", :value => user.id, :id => "user_checkbox_#{user.id}" } %td= link_to user.login, {:action => "edit", :id => user.id} %td= user.last_name %td= user.first_name -- 1.7.2.3

13 years, 8 months

2
1
0 / 0

[PATCH aggregator 1/2] BZ#640503 Added validation check on Quota Model for maximum size on values

by Martyn Taylor

From: martyntaylor <mtaylor(a)redhat.com> --- src/app/models/quota.rb | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/models/quota.rb b/src/app/models/quota.rb index ad35076..83c20c4 100644 --- a/src/app/models/quota.rb +++ b/src/app/models/quota.rb @@ -25,8 +25,17 @@ class Quota < ActiveRecord::Base has_one :cloud_account has_one :user - validates_numericality_of :maximum_total_instances, :greater_than_or_equal_to => 0, :allow_nil => true - validates_numericality_of :maximum_running_instances, :greater_than_or_equal_to => 0, :allow_nil => true + validates_numericality_of :maximum_total_instances, + :greater_than_or_equal_to => 0, + :less_than_or_equal_to => 2147483647, + :integer_only => true, + :allow_nil => true + + validates_numericality_of :maximum_running_instances, + :greater_than_or_equal_to => 0, + :less_than_or_equal_to => 2147483647, + :integer_only => true, + :allow_nil => true QuotaResource = Struct.new(:name, :used, :max, :available, :unit) -- 1.7.2.3

13 years, 8 months

2
2
0 / 0

small UI fixes rev.1

by Tomas Sedovic

These two patches result from the feedback to the original "small UI fixes" patchset. I've joined the first and second patch from the previous set together as they touch the same thing.

13 years, 8 months

1
2
0 / 0

short term workaround for lots of checkboxes as requested by jprovazn

by Jakub Steiner

Applies on 0101c6c3962968905a02c8043d5168c335b62d37 [PATCH] Use disclosure triangles for software groups as suggested by bug #643147

13 years, 8 months

2
2
0 / 0

small UI fixes

by Jakub Steiner

Applies to 8fd5cb2db47c93b3b196648f1d7fb0e5b012725b [PATCH 1/3] Make the cancel button on the user page behave it should. [PATCH 2/3] Drop modalbox for the new user page if a user is logged in. Only show .modalbox when user is self-servicing. [PATCH 3/3] Bring the Instance Management page closer to the latest mockup.

13 years, 8 months

3
5
0 / 0

[PATCH aggregator] BZ #641956: remove template creation on 'new template form' until it is submitted

by Mo Morsi

Currently when a user adds a package to a new template, a temporary template gets created for use until the form is submitted. If the user cancels the form, the template still exists when it should not. This patch simply changes the create template logic to only create the template when the form is submitted --- src/app/controllers/templates_controller.rb | 64 +++++++++++------------ src/app/models/template.rb | 18 ++---- src/app/util/image_descriptor_xml.rb | 4 ++ src/app/views/templates/_content_selection.haml | 52 ------------------ src/app/views/templates/_managed_content.haml | 21 ++++---- src/app/views/templates/add_software_form.haml | 1 - src/app/views/templates/content_selection.haml | 41 ++++++++++++++ src/app/views/templates/managed_content.haml | 1 + src/app/views/templates/new.haml | 51 +++++++++--------- 9 files changed, 118 insertions(+), 135 deletions(-) delete mode 100644 src/app/views/templates/_content_selection.haml delete mode 100644 src/app/views/templates/add_software_form.haml create mode 100644 src/app/views/templates/content_selection.haml create mode 100644 src/app/views/templates/managed_content.haml diff --git a/src/app/controllers/templates_controller.rb b/src/app/controllers/templates_controller.rb index 8d97c05..cf87ed3 100644 --- a/src/app/controllers/templates_controller.rb +++ b/src/app/controllers/templates_controller.rb @@ -40,9 +40,13 @@ class TemplatesController < ApplicationController def new # can't use @template variable - is used by compass (or something other) - @tpl = Template.find_or_create(params[:id]) + @id = params[:id] + @tpl = @id.nil? ? Template.new : Template.find(@id) @repository_manager = RepositoryManager.new @groups = @repository_manager.all_groups(params[:repository]) + + @selected_packages = @tpl.xml.packages.collect { |p| p[:name] } + @selected_groups = [] end def create @@ -51,30 +55,17 @@ class TemplatesController < ApplicationController return end - @tpl = (params[:tpl] && !params[:tpl][:id].to_s.empty?) ? Template.find(params[:tpl][:id]) : Template.new(params[:tpl]) + @id = params[:tpl][:id] + @tpl = @id.nil? || @id == "" ? Template.new(params[:tpl]) : Template.find(@id) - unless params[:add_software_form] and request.xhr? - # this is crazy, but we have most attrs in xml and also in model, - # synchronize it at first to xml - @tpl.update_xml_attributes!(params[:tpl]) - end + @tpl.xml.clear_packages - # if remove pkg, we only update xml and render 'new' template - # again - params.keys.each do |param| - if param =~ /^remove_package_(.*)$/ - update_group_or_package(:remove_package, $1) - render :action => 'new' - return - end - end + params[:groups].to_a.each { |group| @tpl.xml.add_group(group) } + params[:packages].to_a.each { |pkg| @tpl.xml.add_package(pkg) } - if params[:add_software_form] - @repository_manager = RepositoryManager.new - @groups = @repository_manager.all_groups_with_tagged_selected_packages((a)tpl.xml.packages, params[:repository]) - render :action => 'add_software_form' - return - end + # this is crazy, but we have most attrs in xml and also in model, + # synchronize it at first to xml + @tpl.update_xml_attributes(params[:tpl]) if @tpl.save flash[:notice] = "Template saved." @@ -83,24 +74,29 @@ class TemplatesController < ApplicationController else @repository_manager = RepositoryManager.new @groups = @repository_manager.all_groups(params[:repository]) + @selected_packages = @tpl.xml.packages.collect { |p| p[:name] } + @selected_groups = [] render :action => 'new' end end - def add_software - @tpl = params[:template_id].to_s.empty? ? Template.new : Template.find(params[:template_id]) + def content_selection @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) } - params[:packages].to_a.each { |pkg| @tpl.xml.add_package(pkg) } - @tpl.save_xml! - end - if params[:ajax] - render :partial => 'managed_content' - else - render :action => 'new' + packages = @tpl.nil? ? [] : @tpl.xml.packages + @groups = @repository_manager.all_groups_with_tagged_selected_packages(packages, params[:repository]) + render :layout => false + end + + def managed_content + @repository_manager = RepositoryManager.new + @groups = @repository_manager.all_groups(params[:repository]) + @selected_packages = params[:selected_packages] || [] + @selected_groups = params[:selected_groups] || [] + unless params[:template_id].nil? || params[:template_id] == "" + @selected_packages += + Template.find(params[:template_id]).xml.packages.collect { |p| p[:name] } end + render :layout => false end def build_form diff --git a/src/app/models/template.rb b/src/app/models/template.rb index 6457f7a..2e76a53 100644 --- a/src/app/models/template.rb +++ b/src/app/models/template.rb @@ -18,21 +18,15 @@ class Template < ActiveRecord::Base validates_presence_of :platform_version validates_presence_of :architecture - def update_xml_attributes!(opts = {}) - doc = xml - doc.name = opts[:name] if opts[:name] - doc.platform = opts[:platform] if opts[:platform] - doc.description = opts[:summary] if opts[:summary] - doc.platform_version = opts[:platform_version] if opts[:platform_version] - doc.architecture = opts[:architecture] if opts[:architecture] - save_xml! - end - - def save_xml! + def update_xml_attributes(opts = {}) + xml.name = opts[:name] if opts[:name] + xml.platform = opts[:platform] if opts[:platform] + xml.description = opts[:summary] if opts[:summary] + xml.platform_version = opts[:platform_version] if opts[:platform_version] + xml.architecture = opts[:architecture] if opts[:architecture] self[:xml] = xml.to_xml @xml = nil update_attrs - save_without_validation! end def xml diff --git a/src/app/util/image_descriptor_xml.rb b/src/app/util/image_descriptor_xml.rb index e8fe552..034d943 100644 --- a/src/app/util/image_descriptor_xml.rb +++ b/src/app/util/image_descriptor_xml.rb @@ -141,6 +141,10 @@ class ImageDescriptorXML end end + def clear_packages + @root.xpath('/image/packages').each { |s| s.remove } + end + private def add_group_node(parent, group) diff --git a/src/app/views/templates/_content_selection.haml b/src/app/views/templates/_content_selection.haml deleted file mode 100644 index 2372a4a..0000000 --- a/src/app/views/templates/_content_selection.haml +++ /dev/null @@ -1,52 +0,0 @@ -.grid_16 - %h3 Managed Content Selection - - - form_tag :action => "add_software" do - %fieldset.clearfix - .search.grid_4.alpha - %input{:type => "search", :placeholder => "Search for package", :disabled => "disabled"} - %button.action - = hidden_field_tag :template_id, @tpl.id - .grid_8 - %p - Repositories to Search: - %a (Check all) - %fieldset - - @repository_manager.repositories.each do |repo| - = check_box_tag 'repositories[]', repo.id, true - = label_tag 'repositories[]', repo.name - %a.grid_4.omega Advanced Search - -#%fieldset.clearfix - -# .grid_3.alpha - -# = radio_button_tag :show_mode, 'group', true - -# = label_tag :show_mode, 'Show by Group' - -# .grid_2.omega - -# = radio_button_tag :show_mode, 'type', false, :disabled => true - -# = label_tag :show_mode, 'Show by Type' - - -#%fieldset.clearfix - -# = submit_tag "Add Selected", :name => "add_selected", :class => "grid_2 alpha", :id => "do_add_software" - -# = submit_tag "Cancel", :name => "cancel", :class => "grid_2", :id => "cancel_add_software" - %ul.softwaregroups - - groups = @groups.keys.sort - - unsorted = groups.delete('unsorted') - - groups.push('unsorted') if params[:show_unsorted] and unsorted - - groups.each do |group| - - group_sel = @groups[group][:selected] - - group_id = group.gsub(/\s/, '_') - %li - = check_box_tag 'groups[]', group, group_sel, :disabled => group_sel, :id => "group_#{group_id}" - = label_tag "group_#{group_id}", group - %ul{:class => "packages group_#{group_id}"} - - pkgs = @groups[group][:packages] - - pkgs.keys.sort.each do |pkg| - - pkg_sel = pkgs[pkg][:selected] ? true : false - - pkg_id = pkg.gsub(/\s/, '_') - %li - = check_box_tag 'packages[]', pkg, pkg_sel, :disabled => pkg_sel, :id => "package_#{pkg_id}" - = label_tag "package_#{pkg_id}", pkg - - = link_to "Show unsorted packages", {:action => 'create', :add_software_form => true, :show_unsorted => true, 'tpl[id]' => @tpl.id}, {:id => 'switch_all_link'} unless params[:show_unsorted] - %fieldset.clearfix - = submit_tag "Add Selected", :name => "add_selected", :class => "grid_2 alpha", :id => "do_add_software" - = submit_tag "Cancel", :name => "cancel", :class => "grid_2", :id => "cancel_add_software" diff --git a/src/app/views/templates/_managed_content.haml b/src/app/views/templates/_managed_content.haml index f6c8f7b..a4d1303 100644 --- a/src/app/views/templates/_managed_content.haml +++ b/src/app/views/templates/_managed_content.haml @@ -1,26 +1,25 @@ #selected_packages - / we place template id into this partial, because - / if we want to add software with ajax, it's possible - / that template is not saved in db yet -> in this case - / template is saved when software is added and we have - / to pass template id back to new form - = hidden_field :tpl, :id %h3.gap Managed Content to Bundle %hr %label.header.alpha.prefix_2.grid_7 Name: %label.header.omega.grid_2.suffix_5 Repository: %label.grid_2.alpha.clear Managed: .grid_14.omega - - if @tpl.xml.packages.empty? + - if @selected_packages.empty? No selected packages - else - repos = @repository_manager.repositories_hash - - @tpl.xml.packages.each do |pkg| - - pkg_group = @groups.keys.find {|g| @groups[g][:packages][pkg[:name]]} + - @selected_packages.each do |pkg| + - pkg_group = @groups.keys.find {|g| @groups[g][:packages][pkg]} %fieldset.clearfix - = text_field_tag 'packages[]', pkg[:name], :disabled => true, :id => "selected_package_#{pkg[:name]}", :class => "alpha grid_7 packagename" + = text_field_tag 'packages[]', pkg, :id => "selected_package_#{pkg}", :class => "alpha grid_7 packagename" .grid_2= (pkg_group and repo = repos[@groups[pkg_group][:repository_id]]) ? repo.name.to_s : ' ' .grid_5.omega %button{:type => 'button', :disabled => 'disabled'} Config %button{:type => 'button', :disabled => 'disabled'} Metadata - = submit_tag "Remove", :name => "remove_package_#{pkg[:name]}", :id => "remove_package_#{pkg[:name]}" + %button{:type => 'button', + :name => "remove_package_#{pkg}", + :id => "remove_package_#{pkg}", + :class => "remove_package"} Remove + - @selected_groups.each do |grp| + = hidden_field 'groups[]', grp diff --git a/src/app/views/templates/add_software_form.haml b/src/app/views/templates/add_software_form.haml deleted file mode 100644 index d32729a..0000000 --- a/src/app/views/templates/add_software_form.haml +++ /dev/null @@ -1 +0,0 @@ -= render :partial => 'content_selection' diff --git a/src/app/views/templates/content_selection.haml b/src/app/views/templates/content_selection.haml new file mode 100644 index 0000000..a525075 --- /dev/null +++ b/src/app/views/templates/content_selection.haml @@ -0,0 +1,41 @@ +.grid_16 + %h3 Managed Content Selection + + - form_tag :action => "add_software" do + %fieldset.clearfix + .search.grid_4.alpha + %input{:type => "search", :placeholder => "Search for package", :disabled => "disabled"} + %button.action + .grid_8 + %p + Repositories to Search: + %a (Check all) + %fieldset + - @repository_manager.repositories.each do |repo| + = check_box_tag 'repositories[]', repo.id, true + = label_tag 'repositories[]', repo.name + %a.grid_4.omega Advanced Search + + %ul.softwaregroups + - groups = @groups.keys.sort + - unsorted = groups.delete('unsorted') + - groups.push('unsorted') if params[:show_unsorted] and unsorted + - groups.each do |group| + - group_sel = @groups[group][:selected] + - group_id = group.gsub(/\s/, '_') + %li + = check_box_tag 'groups[]', group, group_sel, :disabled => group_sel, :id => "group_#{group_id}" + = label_tag "group_#{group_id}", group + %ul{:class => "packages group_#{group_id}"} + - pkgs = @groups[group][:packages] + - pkgs.keys.sort.each do |pkg| + - pkg_sel = pkgs[pkg][:selected] ? true : false + - pkg_id = pkg.gsub(/\s/, '_') + %li + = check_box_tag 'packages[]', pkg, pkg_sel, :disabled => pkg_sel, :id => "package_#{pkg_id}" + = label_tag "package_#{pkg_id}", pkg + = link_to "Show unsorted packages", {:action => 'content_selection', :show_unsorted => true}, {:id => 'switch_all_link'} unless params[:show_unsorted] + + %fieldset.clearfix + = submit_tag "Add Selected", :name => "add_selected", :class => "grid_2 alpha", :id => "do_add_software" + = submit_tag "Cancel", :name => "cancel", :class => "grid_2", :id => "cancel_add_software" diff --git a/src/app/views/templates/managed_content.haml b/src/app/views/templates/managed_content.haml new file mode 100644 index 0000000..926142d --- /dev/null +++ b/src/app/views/templates/managed_content.haml @@ -0,0 +1 @@ += render :partial => 'managed_content' diff --git a/src/app/views/templates/new.haml b/src/app/views/templates/new.haml index 42fc85d..7dab514 100644 --- a/src/app/views/templates/new.haml +++ b/src/app/views/templates/new.haml @@ -1,37 +1,33 @@ :javascript $(document).ready(function() { - var $container = $('#package_selection_list'), - $submit = $('#add_software_button'); - $submit.click(function(e, show_all) { - var list_url = '#{url_for :action => 'create', :add_software_form => true}'; - var list_all_url = '#{url_for :action => 'create', :add_software_form => true, :show_unsorted => true}'; - var list_data = {'tpl[id]': $("input[name='tpl[id]']").val() || '', ajax: true}; + var $content_container = $('#managed_content'); + var $sel_pkg_container = $('#package_selection_list'); + var $submit = $('#add_software_button'); + $submit.click(function(e) { e.preventDefault(); - $(this).hide(); - $container.empty().show().addClass('loading'); - $container.load(show_all ? list_all_url : list_url, list_data, function() { - $container.removeClass('loading'); + $submit.hide(); + $content_container.empty().show(); + $sel_pkg_container.empty().show().addClass('loading'); + var url = '#{url_for :action => 'content_selection'}'; + $sel_pkg_container.load(url, {}, function(){ + $sel_pkg_container.removeClass('loading');; $('#do_add_software').click(function(e) { - var url = '#{url_for :action => 'add_software', :ajax => true, :add_selected => true}'; + e.preventDefault(); + var url = '#{url_for :action => 'managed_content'}'; var data = { - 'packages[]': $("input:checked[name='packages[]']").map(function() {return $(this).val()}).get(), - 'groups[]': $("input:checked[name='groups[]']").map(function() {return $(this).val()}).get(), - 'template_id': $("input[name='tpl[id]']").val() || '' + 'selected_packages[]': $("input:checked[name='packages[]']").map(function() {return $(this).val()}).get(), + 'selected_groups[]': $("input:checked[name='groups[]']").map(function() {return $(this).val()}).get(), + 'template_id' : '#{(a)id.nil? ? nil : @id}' }; - e.preventDefault(); - $(this).replaceWith('<span class="loading grid_2 alpha">Adding Packages</span>'); - $('#selected_packages').load(url, data, function() { - $container.hide(); + $content_container.load(url, data, function(){ + $sel_pkg_container.empty().show(); $submit.show(); + $('.remove_package').click(function() { $(this).parent().parent().remove(); }); }); }); - $('#switch_all_link').click(function(e) { - e.preventDefault(); - $submit.trigger('click', [true]); - }); $('#cancel_add_software').click(function(e) { e.preventDefault(); - $container.hide(); + $sel_pkg_container.empty().show(); $submit.show(); }); $(".softwaregroups input[type='checkbox']").click(function() { @@ -43,11 +39,13 @@ }); }); }); + $('.remove_package').click(function() { $(this).parent().parent().remove(); }); }); .grid_16 %h2 Template - form_for @tpl, :url => { :action => "create" } do + = hidden_field :tpl, :id = error_messages_for 'tpl' = render :partial => 'basics' @@ -74,12 +72,15 @@ %a{:href => '#'} Remove ) - = render :partial => 'managed_content' + #managed_content + = render :partial => 'managed_content' .clearfix .grid_14.alpha.prefix_2 - = submit_tag "Add Software", :name => "add_software_form", :id => "add_software_button", :class => "iconbutton" + %button{:type => 'button', :id => 'add_software_button'} + Add Software #package_selection_list{:style => 'display: none'} + %h3.gap.clear Preboot Configuration %hr %fieldset.clearfix -- 1.7.2.3

13 years, 8 months

2
3
0 / 0

[PATCH aggregator] BZ #641956: remove template creation on 'new template form' until it is submitted (rev 2)

by Mo Morsi

Currently when a user adds a package to a new template, a temporary template gets created for use until the form is submitted. If the user cancels the form, the template still exists when it should not. This patch simply changes the create template logic to only create the template when the form is submitted This patch now works both when javascript is enabled and disabled. --- src/app/controllers/templates_controller.rb | 127 +++++++++++++--------- src/app/models/template.rb | 18 +-- src/app/util/image_descriptor_xml.rb | 4 + src/app/views/templates/_content_selection.haml | 52 --------- src/app/views/templates/_hidden_fields.haml | 8 ++ src/app/views/templates/_managed_content.haml | 18 ++-- src/app/views/templates/add_software_form.haml | 1 - src/app/views/templates/content_selection.haml | 43 ++++++++ src/app/views/templates/managed_content.haml | 1 + src/app/views/templates/new.haml | 54 +++++----- 10 files changed, 172 insertions(+), 154 deletions(-) delete mode 100644 src/app/views/templates/_content_selection.haml create mode 100644 src/app/views/templates/_hidden_fields.haml delete mode 100644 src/app/views/templates/add_software_form.haml create mode 100644 src/app/views/templates/content_selection.haml create mode 100644 src/app/views/templates/managed_content.haml diff --git a/src/app/controllers/templates_controller.rb b/src/app/controllers/templates_controller.rb index 8d97c05..cc896c9 100644 --- a/src/app/controllers/templates_controller.rb +++ b/src/app/controllers/templates_controller.rb @@ -38,69 +38,89 @@ class TemplatesController < ApplicationController end end + # Since the template form submission can mean multiple things, + # we dispatch based on form parameters here + def dispatch + if params[:save] + redirect_to params.merge({ :action => :create }) + + elsif params[:cancel] + redirect_to params.merge({ :action => 'index' }) + + elsif params[:add_software_form] + redirect_to params.merge({ :action => :content_selection }) + + elsif pkg = params.keys.find { |k| k =~ /^remove_package_(.*)$/ } + # actually remove the package from list + params[:packages].delete($1) if params[:packages] + # XXX only way to explicitly specify an empty package list in the redirect: + params[:packages] << nil if params[:packages] && params[:packages].size == 0 + redirect_to params.merge({:action => :new}) + + elsif params[:add_selected] + redirect_to params.merge({:action => :new}) + + elsif params[:cancel_add_software] + redirect_to params.merge({:action => :new}) + + end + end + + # FIXME at some point split edit/update out from new/create + # to conform to web standards def new # can't use @template variable - is used by compass (or something other) - @tpl = Template.find_or_create(params[:id]) - @repository_manager = RepositoryManager.new - @groups = @repository_manager.all_groups(params[:repository]) + @id = params[:id] + @tpl = @id.nil? ? Template.new : Template.find(@id) + @tpl.attributes = params[:tpl] unless params[:tpl].nil? + get_selected_packages(@tpl) end def create - if params[:cancel] - redirect_to :action => 'index' - return - end + @id = params[:tpl][:id] + @tpl = @id.nil? || @id == "" ? Template.new(params[:tpl]) : Template.find(@id) - @tpl = (params[:tpl] && !params[:tpl][:id].to_s.empty?) ? Template.find(params[:tpl][:id]) : Template.new(params[:tpl]) + @tpl.xml.clear_packages - unless params[:add_software_form] and request.xhr? - # this is crazy, but we have most attrs in xml and also in model, - # synchronize it at first to xml - @tpl.update_xml_attributes!(params[:tpl]) - end - - # if remove pkg, we only update xml and render 'new' template - # again - params.keys.each do |param| - if param =~ /^remove_package_(.*)$/ - update_group_or_package(:remove_package, $1) - render :action => 'new' - return - end - end + params[:groups].to_a.each { |group| @tpl.xml.add_group(group) } + params[:packages].to_a.each { |pkg| @tpl.xml.add_package(pkg) } - if params[:add_software_form] - @repository_manager = RepositoryManager.new - @groups = @repository_manager.all_groups_with_tagged_selected_packages((a)tpl.xml.packages, params[:repository]) - render :action => 'add_software_form' - return - end + # this is crazy, but we have most attrs in xml and also in model, + # synchronize it at first to xml + @tpl.update_xml_attributes(params[:tpl]) if @tpl.save flash[:notice] = "Template saved." @tpl.set_complete redirect_to :action => 'index' else - @repository_manager = RepositoryManager.new - @groups = @repository_manager.all_groups(params[:repository]) + get_selected_packages(@tpl) render :action => 'new' end end - def add_software - @tpl = params[:template_id].to_s.empty? ? Template.new : Template.find(params[:template_id]) + def content_selection @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) } - params[:packages].to_a.each { |pkg| @tpl.xml.add_package(pkg) } - @tpl.save_xml! - end - if params[:ajax] - render :partial => 'managed_content' - else - render :action => 'new' + @id = params[:tpl][:id] if params[:tpl] + @tpl = Template.new(params[:tpl]) + @packages = @tpl.xml.packages + @packages += params[:packages] if params[:packages] + # FIXME this is not tagging the packages as they should be + @groups = @repository_manager.all_groups_with_tagged_selected_packages(@packages, params[:repository]) + @embed = params[:embed] + render :layout => false if @embed + end + + def managed_content + @repository_manager = RepositoryManager.new + @groups = @repository_manager.all_groups(params[:repository]) + @selected_packages = params[:selected_packages] || [] + @selected_groups = params[:selected_groups] || [] + unless params[:template_id].nil? || params[:template_id] == "" + @selected_packages += + Template.find(params[:template_id]).xml.packages.collect { |p| p[:name] } end + render :layout => false end def build_form @@ -162,15 +182,6 @@ class TemplatesController < ApplicationController private - def update_group_or_package(method, *args) - @repository_manager = RepositoryManager.new - @groups = @repository_manager.all_groups(params[:repository]) - @tpl.xml.send(method, *args) - # we save template w/o validation (we can add package before name,... is - # set) - @tpl.save_xml! - end - def check_permission require_privilege(Privilege::IMAGE_MODIFY) end @@ -183,4 +194,16 @@ class TemplatesController < ApplicationController end return ids.first end + + def get_selected_packages(tpl) + @repository_manager = RepositoryManager.new + @groups = @repository_manager.all_groups(params[:repository]) + + @selected_packages = params.has_key?(:packages) ? + params[:packages] : + tpl.xml.packages.collect { |p| p[:name] } + @selected_packages.delete("") + + @selected_groups = [] + end end diff --git a/src/app/models/template.rb b/src/app/models/template.rb index 6457f7a..2e76a53 100644 --- a/src/app/models/template.rb +++ b/src/app/models/template.rb @@ -18,21 +18,15 @@ class Template < ActiveRecord::Base validates_presence_of :platform_version validates_presence_of :architecture - def update_xml_attributes!(opts = {}) - doc = xml - doc.name = opts[:name] if opts[:name] - doc.platform = opts[:platform] if opts[:platform] - doc.description = opts[:summary] if opts[:summary] - doc.platform_version = opts[:platform_version] if opts[:platform_version] - doc.architecture = opts[:architecture] if opts[:architecture] - save_xml! - end - - def save_xml! + def update_xml_attributes(opts = {}) + xml.name = opts[:name] if opts[:name] + xml.platform = opts[:platform] if opts[:platform] + xml.description = opts[:summary] if opts[:summary] + xml.platform_version = opts[:platform_version] if opts[:platform_version] + xml.architecture = opts[:architecture] if opts[:architecture] self[:xml] = xml.to_xml @xml = nil update_attrs - save_without_validation! end def xml diff --git a/src/app/util/image_descriptor_xml.rb b/src/app/util/image_descriptor_xml.rb index e8fe552..034d943 100644 --- a/src/app/util/image_descriptor_xml.rb +++ b/src/app/util/image_descriptor_xml.rb @@ -141,6 +141,10 @@ class ImageDescriptorXML end end + def clear_packages + @root.xpath('/image/packages').each { |s| s.remove } + end + private def add_group_node(parent, group) diff --git a/src/app/views/templates/_content_selection.haml b/src/app/views/templates/_content_selection.haml deleted file mode 100644 index 2372a4a..0000000 --- a/src/app/views/templates/_content_selection.haml +++ /dev/null @@ -1,52 +0,0 @@ -.grid_16 - %h3 Managed Content Selection - - - form_tag :action => "add_software" do - %fieldset.clearfix - .search.grid_4.alpha - %input{:type => "search", :placeholder => "Search for package", :disabled => "disabled"} - %button.action - = hidden_field_tag :template_id, @tpl.id - .grid_8 - %p - Repositories to Search: - %a (Check all) - %fieldset - - @repository_manager.repositories.each do |repo| - = check_box_tag 'repositories[]', repo.id, true - = label_tag 'repositories[]', repo.name - %a.grid_4.omega Advanced Search - -#%fieldset.clearfix - -# .grid_3.alpha - -# = radio_button_tag :show_mode, 'group', true - -# = label_tag :show_mode, 'Show by Group' - -# .grid_2.omega - -# = radio_button_tag :show_mode, 'type', false, :disabled => true - -# = label_tag :show_mode, 'Show by Type' - - -#%fieldset.clearfix - -# = submit_tag "Add Selected", :name => "add_selected", :class => "grid_2 alpha", :id => "do_add_software" - -# = submit_tag "Cancel", :name => "cancel", :class => "grid_2", :id => "cancel_add_software" - %ul.softwaregroups - - groups = @groups.keys.sort - - unsorted = groups.delete('unsorted') - - groups.push('unsorted') if params[:show_unsorted] and unsorted - - groups.each do |group| - - group_sel = @groups[group][:selected] - - group_id = group.gsub(/\s/, '_') - %li - = check_box_tag 'groups[]', group, group_sel, :disabled => group_sel, :id => "group_#{group_id}" - = label_tag "group_#{group_id}", group - %ul{:class => "packages group_#{group_id}"} - - pkgs = @groups[group][:packages] - - pkgs.keys.sort.each do |pkg| - - pkg_sel = pkgs[pkg][:selected] ? true : false - - pkg_id = pkg.gsub(/\s/, '_') - %li - = check_box_tag 'packages[]', pkg, pkg_sel, :disabled => pkg_sel, :id => "package_#{pkg_id}" - = label_tag "package_#{pkg_id}", pkg - - = link_to "Show unsorted packages", {:action => 'create', :add_software_form => true, :show_unsorted => true, 'tpl[id]' => @tpl.id}, {:id => 'switch_all_link'} unless params[:show_unsorted] - %fieldset.clearfix - = submit_tag "Add Selected", :name => "add_selected", :class => "grid_2 alpha", :id => "do_add_software" - = submit_tag "Cancel", :name => "cancel", :class => "grid_2", :id => "cancel_add_software" diff --git a/src/app/views/templates/_hidden_fields.haml b/src/app/views/templates/_hidden_fields.haml new file mode 100644 index 0000000..3fcab65 --- /dev/null +++ b/src/app/views/templates/_hidden_fields.haml @@ -0,0 +1,8 @@ +- # the template fields as hidden form inputs +<input type="hidden" id="id" name="id" value="#{@id}" /> += hidden_field :tpl, :id += hidden_field :tpl, :name += hidden_field :tpl, :summary += hidden_field :tpl, :platform += hidden_field :tpl, :platform_version += hidden_field :tpl, :architecture diff --git a/src/app/views/templates/_managed_content.haml b/src/app/views/templates/_managed_content.haml index f6c8f7b..fedb752 100644 --- a/src/app/views/templates/_managed_content.haml +++ b/src/app/views/templates/_managed_content.haml @@ -1,26 +1,22 @@ #selected_packages - / we place template id into this partial, because - / if we want to add software with ajax, it's possible - / that template is not saved in db yet -> in this case - / template is saved when software is added and we have - / to pass template id back to new form - = hidden_field :tpl, :id %h3.gap Managed Content to Bundle %hr %label.header.alpha.prefix_2.grid_7 Name: %label.header.omega.grid_2.suffix_5 Repository: %label.grid_2.alpha.clear Managed: .grid_14.omega - - if @tpl.xml.packages.empty? + - if @selected_packages.empty? No selected packages - else - repos = @repository_manager.repositories_hash - - @tpl.xml.packages.each do |pkg| - - pkg_group = @groups.keys.find {|g| @groups[g][:packages][pkg[:name]]} + - @selected_packages.each do |pkg| + - pkg_group = @groups.keys.find {|g| @groups[g][:packages][pkg]} %fieldset.clearfix - = text_field_tag 'packages[]', pkg[:name], :disabled => true, :id => "selected_package_#{pkg[:name]}", :class => "alpha grid_7 packagename" + = text_field_tag 'packages[]', pkg, :id => "selected_package_#{pkg}", :class => "alpha grid_7 packagename" .grid_2= (pkg_group and repo = repos[@groups[pkg_group][:repository_id]]) ? repo.name.to_s : ' ' .grid_5.omega %button{:type => 'button', :disabled => 'disabled'} Config %button{:type => 'button', :disabled => 'disabled'} Metadata - = submit_tag "Remove", :name => "remove_package_#{pkg[:name]}", :id => "remove_package_#{pkg[:name]}" + = submit_tag "Remove", :name => "remove_package_#{pkg}", :id => "remove_package_#{pkg}", :class => 'remove_package' + - @selected_groups.each do |grp| + = hidden_field 'groups[]', grp diff --git a/src/app/views/templates/add_software_form.haml b/src/app/views/templates/add_software_form.haml deleted file mode 100644 index d32729a..0000000 --- a/src/app/views/templates/add_software_form.haml +++ /dev/null @@ -1 +0,0 @@ -= render :partial => 'content_selection' diff --git a/src/app/views/templates/content_selection.haml b/src/app/views/templates/content_selection.haml new file mode 100644 index 0000000..b03755d --- /dev/null +++ b/src/app/views/templates/content_selection.haml @@ -0,0 +1,43 @@ +.grid_16 + %h3 Managed Content Selection + + - form_tag :action => "dispatch" do + - unless @embed + = render :partial => 'hidden_fields' + %fieldset.clearfix + .search.grid_4.alpha + %input{:type => "search", :placeholder => "Search for package", :disabled => "disabled"} + %button.action + .grid_8 + %p + Repositories to Search: + %a (Check all) + %fieldset + - @repository_manager.repositories.each do |repo| + = check_box_tag 'repositories[]', repo.id, true + = label_tag 'repositories[]', repo.name + %a.grid_4.omega Advanced Search + + %ul.softwaregroups + - groups = @groups.keys.sort + - unsorted = groups.delete('unsorted') + - groups.push('unsorted') if params[:show_unsorted] and unsorted + - groups.each do |group| + - group_sel = @groups[group][:selected] + - group_id = group.gsub(/\s/, '_') + %li + = check_box_tag 'groups[]', group, group_sel, :disabled => group_sel, :id => "group_#{group_id}" + = label_tag "group_#{group_id}", group + %ul{:class => "packages group_#{group_id}"} + - pkgs = @groups[group][:packages] + - pkgs.keys.sort.each do |pkg| + - pkg_sel = pkgs[pkg][:selected] ? true : false + - pkg_id = pkg.gsub(/\s/, '_') + %li + = check_box_tag 'packages[]', pkg, pkg_sel, :disabled => pkg_sel, :id => "package_#{pkg_id}" + = label_tag "package_#{pkg_id}", pkg + = link_to "Show unsorted packages", {:action => 'create', :add_software_form => true, :show_unsorted => true, 'tpl[id]' => @tpl.id}, {:id => 'switch_all_link'} unless params[:show_unsorted] + + %fieldset.clearfix + = submit_tag "Add Selected", :name => "add_selected", :class => "grid_2 alpha", :id => "do_add_software" + = submit_tag "Cancel", :name => "cancel_add_software", :class => "grid_2", :id => "cancel_add_software" diff --git a/src/app/views/templates/managed_content.haml b/src/app/views/templates/managed_content.haml new file mode 100644 index 0000000..926142d --- /dev/null +++ b/src/app/views/templates/managed_content.haml @@ -0,0 +1 @@ += render :partial => 'managed_content' diff --git a/src/app/views/templates/new.haml b/src/app/views/templates/new.haml index 42fc85d..ebe6704 100644 --- a/src/app/views/templates/new.haml +++ b/src/app/views/templates/new.haml @@ -1,37 +1,33 @@ :javascript $(document).ready(function() { - var $container = $('#package_selection_list'), - $submit = $('#add_software_button'); - $submit.click(function(e, show_all) { - var list_url = '#{url_for :action => 'create', :add_software_form => true}'; - var list_all_url = '#{url_for :action => 'create', :add_software_form => true, :show_unsorted => true}'; - var list_data = {'tpl[id]': $("input[name='tpl[id]']").val() || '', ajax: true}; + var $content_container = $('#managed_content'); + var $sel_pkg_container = $('#package_selection_list'); + var $submit = $('#add_software_button'); + $submit.click(function(e) { e.preventDefault(); - $(this).hide(); - $container.empty().show().addClass('loading'); - $container.load(show_all ? list_all_url : list_url, list_data, function() { - $container.removeClass('loading'); + $submit.hide(); + $content_container.empty().show(); + $sel_pkg_container.empty().show().addClass('loading'); + var url = '#{url_for :action => 'content_selection', :embed => true}'; + $sel_pkg_container.load(url, {}, function(){ + $sel_pkg_container.removeClass('loading');; $('#do_add_software').click(function(e) { - var url = '#{url_for :action => 'add_software', :ajax => true, :add_selected => true}'; + e.preventDefault(); + var url = '#{url_for :action => 'managed_content'}'; var data = { - 'packages[]': $("input:checked[name='packages[]']").map(function() {return $(this).val()}).get(), - 'groups[]': $("input:checked[name='groups[]']").map(function() {return $(this).val()}).get(), - 'template_id': $("input[name='tpl[id]']").val() || '' + 'selected_packages[]': $("input:checked[name='packages[]']").map(function() {return $(this).val()}).get(), + 'selected_groups[]': $("input:checked[name='groups[]']").map(function() {return $(this).val()}).get(), + 'template_id' : '#{(a)id.nil? ? nil : @id}' }; - e.preventDefault(); - $(this).replaceWith('<span class="loading grid_2 alpha">Adding Packages</span>'); - $('#selected_packages').load(url, data, function() { - $container.hide(); + $content_container.load(url, data, function(){ + $sel_pkg_container.empty().show(); $submit.show(); + $('.remove_package').click(function() { $(this).parent().parent().remove(); }); }); }); - $('#switch_all_link').click(function(e) { - e.preventDefault(); - $submit.trigger('click', [true]); - }); $('#cancel_add_software').click(function(e) { e.preventDefault(); - $container.hide(); + $sel_pkg_container.empty().show(); $submit.show(); }); $(".softwaregroups input[type='checkbox']").click(function() { @@ -43,12 +39,15 @@ }); }); }); + $('.remove_package').click(function() { $(this).parent().parent().remove(); }); }); .grid_16 %h2 Template - - form_for @tpl, :url => { :action => "create" } do - = error_messages_for 'tpl' + - form_for @tpl, :url => { :action => "dispatch" } do + <input type="hidden" id="id" name="id" value="#{@id}" /> + = hidden_field :tpl, :id + = error_messages_for :tpl = render :partial => 'basics' %h3.disabled.gap Local Content to Bundle @@ -74,12 +73,15 @@ %a{:href => '#'} Remove ) - = render :partial => 'managed_content' + #managed_content + = render :partial => 'managed_content' .clearfix .grid_14.alpha.prefix_2 = submit_tag "Add Software", :name => "add_software_form", :id => "add_software_button", :class => "iconbutton" + #package_selection_list{:style => 'display: none'} + %h3.gap.clear Preboot Configuration %hr %fieldset.clearfix -- 1.7.2.3

13 years, 8 months

1
0
0 / 0

[PATCH] Set the instance_key in dbomatic.

by Chris Lalancette

This certainly isn't the correct long-term place to do this, but we don't want to spend a lot of time doing throw-away code. Enter it in here, and we will have to revisit this when we have a real key management architecture. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- src/dbomatic/dbomatic | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/dbomatic/dbomatic b/src/dbomatic/dbomatic index d52f655..8a3e968 100755 --- a/src/dbomatic/dbomatic +++ b/src/dbomatic/dbomatic @@ -210,6 +210,12 @@ class CondorEventLog < Nokogiri::XML::SAX::Document end inst.cloud_account_id = cloud_account.id + + # FIXME: we are updating the instance_key_id here, but this is really not + # the right way or place to do this. This will have to be revisited when + # we come up with a real key management architecture + inst.instance_key_id = cloud_account.instance_key.id + inst.save! end -- 1.7.3.1

13 years, 8 months

2
1
0 / 0

v2 of ssh ley patchset

by Jason Guiditta

Added a test case, as an intended minor cleanup broke something that worked initially. Also cleanup a couple markup bits that Chris noticed. [PATCH aggregator 1/2] BZ #642432 - test 'determine the key in use for an instance'. [PATCH aggregator 2/2] BZ #642432 - no way to determine the key for an instance.

13 years, 8 months

2
3
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

deltacloud-devel October 2010