Merge pull request #20 from openSUSE/review_121219_no_oneclick_links_…

…for_unsuppported_dists [Review] Request from 'digitaltom' @ 'openSUSE/software-o-o/review_121219_no_oneclick_links_for_unsuppported_dists'
openSUSE · Dec 19, 2012 · 3f48412 · 3f48412
2 parents d99e9b8 + ad9634f
commit 3f48412
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/views/package/_download_rows.html.erb b/app/views/package/_download_rows.html.erb
@@ -30,7 +30,7 @@
         <% end -%>
       <% end -%>
     </ul>
-    <% if distro[:project].match(/SUSE/) %>
+    <% if oneclick && distro[:project].match(/SUSE/) %>
       <% url = url_for :controller => 'main', :action => 'ymp_without_arch_and_version',
         :project => result.first, :repository => result.last.first.repository, :package => @pkgname,
         :base => result.last.first.baseproject, :query => @pkgname%>

diff --git a/app/views/package/show.html.erb b/app/views/package/show.html.erb
@@ -211,9 +211,9 @@
                       update, pkgs = pkgs.partition{|s| s.project == "#{distro[:project]}:Update"}
                       stable, pkgs = pkgs.partition{|s| s.quality == "Stable"} %>
 
-                      <%= render( :partial => 'package/download_rows', :locals => {:packages => official, :distro => distro} ) if update.blank? %>
-                      <%= render :partial => 'package/download_rows', :locals => {:packages => update, :distro => distro} %>
-                      <%= render :partial => 'package/download_rows', :locals => {:packages => stable, :distro => distro} %>
+                      <%= render( :partial => 'package/download_rows', :locals => {:packages => official, :distro => distro, :oneclick => true} ) if update.blank? %>
+                      <%= render :partial => 'package/download_rows', :locals => {:packages => update, :distro => distro, :oneclick => true} %>
+                      <%= render :partial => 'package/download_rows', :locals => {:packages => stable, :distro => distro, :oneclick => true} %>
 
                       <%
                       home, pkgs = pkgs.partition{|s| s.project.match( /^home\:/ )}
@@ -226,8 +226,8 @@
                       <% end -%>
                     </ul>
                     <ul class="pkg-options-details pkg-options-unsupported" id="dist_home_<%= distro[:dist_id] %>" >
-                      <%= render :partial => 'package/download_rows', :locals => {:packages => devel, :distro => distro} %>
-                      <%= render :partial => 'package/download_rows', :locals => {:packages => home, :distro => distro} %>
+                      <%= render :partial => 'package/download_rows', :locals => {:packages => devel, :distro => distro, :oneclick => true} %>
+                      <%= render :partial => 'package/download_rows', :locals => {:packages => home, :distro => distro, :oneclick => true} %>
                     </ul>
 
                   </li>
@@ -241,9 +241,9 @@
                   <li class="extra-dists">
                     <a href="#" onclick=" toggle_dist('<%= escape_for_id distro[:project] %>'); return false;"
                        class="distro-toggle" id="distro-toggle-<%= escape_for_id distro[:project] %>"><b><%= distro[:project].gsub(":", " ").sub("DISCONTINUED", "") %></b></a>
-                       <% pks = @extra_packages.select{|s| s.baseproject == distro[:project] } %>
+                       <% pks = @extra_packages.select{|p| p.baseproject == distro[:project] } %>
                     <ul class="pkg-options-details pkg-options-unsupported" id="dist_<%= escape_for_id distro[:project] %>" >
-                      <%= render :partial => 'download_rows', :locals => {:packages => pks, :distro => distro} %>
+                      <%= render :partial => 'download_rows', :locals => {:packages => pks, :distro => distro, :oneclick => false} %>
                     </ul>
                   </li>
                 <% end %>