Skip to content

Commit

Permalink
[webui] Correct the footer links, fix owner search bug for binaries
Browse files Browse the repository at this point in the history
        which have no package container owner set
  • Loading branch information
hennevogel authored and adrianschroeter committed Feb 19, 2013
1 parent 045bce3 commit ad94748
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
4 changes: 3 additions & 1 deletion src/webui/app/controllers/search_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,9 @@ def search
end
end
project = find_cached(Project, result.project)
package = find_cached(Package, result.package, :project => project)
if result.package
package = find_cached(Package, result.package, :project => project)
end
r << {:type => "owner", :data => result,
:users => users, :groups => groups,
:project => project, :package => package,
Expand Down
9 changes: 4 additions & 5 deletions src/webui/app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,10 @@
<strong class="grey-medium spacer1">Help</strong>
<ul>
<% @helplinks = [
{ 'Open Build Service Portal' => 'http://en.opensuse.org/Portal:Build_Service' },
{ 'Building Packages' => 'http://en.opensuse.org/openSUSE:Build_Service_Tutorial' },
{ 'Writing spec Files' => 'http://en.opensuse.org/openSUSE:Specfile_guidelines' },
{ 'Reporting a Bug' => 'http://en.opensuse.org/openSUSE:Submitting_bug_reports' },
{ 'Forums' => 'http://forums.opensuse.org/english/other-forums/development/open-build-service-obs/' } ]
{ 'Open Build Service' => 'http://openbuildservice.org/' },
{ 'OBS Manuals' => 'http://openbuildservice.org/help/manuals/' },
{ 'openSUSEs OBS Portal' => 'http://en.opensuse.org/Portal:Build_service' },
{ 'Reporting a Bug' => 'http://openbuildservice.org/support/' } ]

@helplinks.each do |helplink|
for k in helplink.keys %>
Expand Down
8 changes: 4 additions & 4 deletions src/webui/app/views/search/_results.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
<% elsif result[:type] == 'owner' %>
<div class="search_result">
<h6>
Responsible for package
<%= link_to "#{result[:data].package}", { :controller => 'package', :action => :show, :package => result[:data].package, :project => result[:data].project }, class: 'package-link'-%>
for <%= result[:data].rootproject %> in project
<%= link_to "#{result[:data].project}", { :controller => 'project', :action => :show, :project => result[:data].project}, class: 'project-link' -%>
Responsible for package
<%= params['search_text'] %>
for <%= result[:data].rootproject %> set in
<%= render :partial => 'shared/project_or_package_link', :locals => {:project => result[:data].project, :package => result[:data].package, :short => false} %>
</h6>
<p>
<% if result[:users] %>
Expand Down

0 comments on commit ad94748

Please sign in to comment.