From: Jan Provaznik <[email protected]>
Name, version and architecture combos are joined to single combo.
Architecture was not in BZ request but I believe it's required too.
---
src/app/models/template.rb | 8 +++++---
src/app/views/templates/_basics.haml | 4 +---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/models/template.rb b/src/app/models/template.rb
index 6457f7a..7ad0ff4 100644
--- a/src/app/models/template.rb
+++ b/src/app/models/template.rb
@@ -21,10 +21,12 @@ class Template < ActiveRecord::Base
def update_xml_attributes!(opts = {})
doc = xml
doc.name = opts[:name] if opts[:name]
- doc.platform = opts[:platform] if opts[:platform]
+ if plat = opts[:platform]
+ doc.platform = plat
+ doc.platform_version = platforms[plat]['version'].to_s
+ doc.architecture = platforms[plat]['architecture']
+ end
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
diff --git a/src/app/views/templates/_basics.haml
b/src/app/views/templates/_basics.haml
index 71a71fe..72d2423 100644
--- a/src/app/views/templates/_basics.haml
+++ b/src/app/views/templates/_basics.haml
@@ -13,9 +13,7 @@
%fieldset.clearfix
- default = @tpl.platforms['fedora']
= label :tpl, :platform, 'Platform Choice:', :class => "grid_4 alpha"
- = select :tpl, :platform, @tpl.platforms.map {|id, p| [p['name'], id]},
{:selected => @tpl.platform || 'fedora'}, {:class => 'grid_7'}
- = select :tpl, :platform_version, @tpl.platforms.map {|id, p|
p['version'].to_s}.sort.uniq, {:selected => @tpl.platform_version ||
default['version']}, {:class => 'grid_3'}
- = select :tpl, :architecture, @tpl.platforms.map {|id, p|
p['architecture']}.sort.uniq, {:selected => @tpl.architecture ||
default['architecture']}, {:class => 'grid_2 omega'}
+ = select :tpl, :platform, @tpl.platforms.map {|id, p| ["#{p['name']}
#{p['version']} (#{p['architecture']})", id]}, {:selected => @tpl.platform ||
'fedora'}, {:class => 'grid_7'}
%fieldset.clearfix
= label_tag :bootable, 'Bootable:', :class => "grid_4 alpha"
.grid_12.omega
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
