For some reaso 'git send-email' doesn't work for me now, so sending as
attachment :(.
>From f16df6500970a8cd45588b8b51e3b3e31e300d58 Mon Sep 17 00:00:00 2001
From: Jan Provaznik <[email protected]>
Date: Fri, 22 Oct 2010 20:19:03 +0200
Subject: [PATCH aggregator 1/3] BZ #643147 - fixed pagination string
replaced "Displaying strings" by "Displaying packages" in pagination info
---
src/app/views/templates/_searched_packages.haml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/app/views/templates/_searched_packages.haml
b/src/app/views/templates/_searched_packages.haml
index 0894cb5..c9df51f 100644
--- a/src/app/views/templates/_searched_packages.haml
+++ b/src/app/views/templates/_searched_packages.haml
@@ -36,6 +36,6 @@
= check_box_tag 'packages[]', pkg, selected, {:disabled => disabled, :id
=> "package_#{pkg}"}
= label_tag "package_#{pkg}", pkg
= will_paginate @searched_packages, :params => {:package_search =>
params[:package_search]}, :renderer =>
TemplatesHelper::ButtonPaginationRenderer.new, :previous_label => 'Previous',
:next_label => 'Next'
-= page_entries_info @searched_packages
+= page_entries_info @searched_packages, :entry_name => 'package'
= render :partial => 'addbuttons'
--
1.7.2.3
>From a702c2df04010a6342f88d3e010512a5747c0f37 Mon Sep 17 00:00:00 2001
From: Jan Provaznik <[email protected]>
Date: Fri, 22 Oct 2010 20:25:17 +0200
Subject: [PATCH aggregator 2/3] BZ #643147 - packages are disabled when selected
When user selects a package/group and clicks "add selected", the package/group
is then disabled (as he can't remove the package/group by unchecking box)
---
src/app/views/templates/new.haml | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/app/views/templates/new.haml b/src/app/views/templates/new.haml
index e7d4d05..cb236c6 100644
--- a/src/app/views/templates/new.haml
+++ b/src/app/views/templates/new.haml
@@ -86,6 +86,8 @@
'template_id' : '#[email protected]? ? nil : @id}'
};
$('#managed_content').load(url, data, function(){
+ $("input:checked[name='groups[]']").attr('disabled', 'disabled');
+ $("input:checked[name='packages[]']").attr('disabled', 'disabled');
$('#add_software_button').show();
$('.dropdown').hide();
});
--
1.7.2.3
>From 49c9ebe60f0a0a3e2d45a40186e1eb2aeac4cd2e Mon Sep 17 00:00:00 2001
From: Jan Provaznik <[email protected]>
Date: Fri, 22 Oct 2010 20:30:51 +0200
Subject: [PATCH aggregator 3/3] BZ #643147 - fixed html id conflicts
There where conflicts in html id conflicts - selected packages had same id as
packages in selection list.
---
src/app/views/templates/_metagroup_packages.haml | 4 ++--
src/app/views/templates/_searched_packages.haml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/views/templates/_metagroup_packages.haml
b/src/app/views/templates/_metagroup_packages.haml
index 07642b1..c709f97 100644
--- a/src/app/views/templates/_metagroup_packages.haml
+++ b/src/app/views/templates/_metagroup_packages.haml
@@ -14,6 +14,6 @@
- @metagroup_packages[group][:packages].each do |pkg|
%li
- selected = @packages.to_a.find {|p| p[:name] == pkg}
- = check_box_tag 'packages[]', pkg, selected, {:disabled =>
selected, :id => "package_#{group}_#{pkg}"}
- = label_tag "package_#{group}_#{pkg}", pkg
+ = check_box_tag 'packages[]', pkg, selected, {:disabled =>
selected, :id => "pkg_#{group}_#{pkg}"}
+ = label_tag "pkg_#{group}_#{pkg}", pkg
= render :partial => 'addbuttons'
diff --git a/src/app/views/templates/_searched_packages.haml
b/src/app/views/templates/_searched_packages.haml
index c9df51f..fdc8ad1 100644
--- a/src/app/views/templates/_searched_packages.haml
+++ b/src/app/views/templates/_searched_packages.haml
@@ -33,8 +33,8 @@
%li
- selected = (@packages.to_a.find {|p| p[:name] == pkg} or
@cached_packages.include?(pkg))
- disabled = params[:selected_packages].to_a.include?(pkg)
- = check_box_tag 'packages[]', pkg, selected, {:disabled => disabled, :id
=> "package_#{pkg}"}
- = label_tag "package_#{pkg}", pkg
+ = check_box_tag 'packages[]', pkg, selected, {:disabled => disabled, :id
=> "pkg_#{pkg}"}
+ = label_tag "pkg_#{pkg}", pkg
= will_paginate @searched_packages, :params => {:package_search =>
params[:package_search]}, :renderer =>
TemplatesHelper::ButtonPaginationRenderer.new, :previous_label => 'Previous',
:next_label => 'Next'
= page_entries_info @searched_packages, :entry_name => 'package'
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
