ignore this one On 09/29/2010 05:14 PM, [email protected] wrote: > From: Jan Provaznik<[email protected]> > > --- > src/app/util/repository_manager.rb | 8 ++++++++ > .../util/repository_manager/comps_repository.rb | 1 + > src/app/util/repository_manager/pulp_repository.rb | 1 + > src/app/views/templates/_managed_content.haml | 4 +++- > 4 files changed, 13 insertions(+), 1 deletions(-) > > diff --git a/src/app/util/repository_manager.rb > b/src/app/util/repository_manager.rb > index 11b6c5e..4f10a85 100644 > --- a/src/app/util/repository_manager.rb > +++ b/src/app/util/repository_manager.rb > @@ -58,6 +58,14 @@ class RepositoryManager > return @all_packages > end > > + def repositories_hash > + res = {} > + @repositories.each do |r| > + res[r.id] = r > + end > + res > + end > + > private > > def load_config > diff --git a/src/app/util/repository_manager/comps_repository.rb > b/src/app/util/repository_manager/comps_repository.rb > index d7e192a..503b9af 100644 > --- a/src/app/util/repository_manager/comps_repository.rb > +++ b/src/app/util/repository_manager/comps_repository.rb > @@ -31,6 +31,7 @@ class CompsRepository< AbstractRepository > name = g.at_xpath('name').text > groups[name] = { > :name => name, > + :repository_id => @id, > :description => (t = g.at_xpath('description')) ? t.text : '', > :packages => pkgs, > } > diff --git a/src/app/util/repository_manager/pulp_repository.rb > b/src/app/util/repository_manager/pulp_repository.rb > index 5641f0c..ef5cde1 100644 > --- a/src/app/util/repository_manager/pulp_repository.rb > +++ b/src/app/util/repository_manager/pulp_repository.rb > @@ -56,6 +56,7 @@ class PulpRepository< AbstractRepository > name = info['name'] > groups[name] = { > :name => name, > + :repository_id => @id, > :description => info['description'].to_s, > :packages => pkgs, > } > diff --git a/src/app/views/templates/_managed_content.haml > b/src/app/views/templates/_managed_content.haml > index 2ce8131..58dd331 100644 > --- a/src/app/views/templates/_managed_content.haml > +++ b/src/app/views/templates/_managed_content.haml > @@ -4,10 +4,12 @@ > %label.header.omega.grid_2.suffix_5 Repository: > %label.grid_2.alpha.clear Managed: > .grid_9.omega > + - repos = @repository_manager.repositories_hash > - @tpl.xml.packages.each do |pkg| > + - pkg_group = @groups.keys.find {|g| @groups[g][:packages][pkg[:name]]} > %fieldset > = text_field_tag 'packages[]', pkg[:name], :disabled => true, :id => > "selected_package_#{pkg[:name]}", :class => "alpha grid_2" > - .grid_2 FIXME Repository > + .grid_2= (pkg_group and repo = > rep...@groups[pkg_group][:repository_id]]) ? repo.name.to_s : ' ' > .grid_5.omega > %button{:type => 'button', :disabled => 'disabled'} Config > %button{:type => 'button', :disabled => 'disabled'} Metadata
_______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
