[webui] Breadcrumb use package_name instead of package

openSUSE · Jun 20, 2018 · 2e05ec6 · 2e05ec6
1 parent 280918a
commit 2e05ec6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/src/api/app/controllers/webui/package_controller.rb b/src/api/app/controllers/webui/package_controller.rb
@@ -128,6 +128,8 @@ def dependency
   def statistics
     @arch = params[:arch]
     @repository = params[:repository]
+    @package_name = params[:package]
+
     @statistics = nil
     begin
       @statistics = Statistic.find_hashed(project: @project, package: params[:package], repository: @repository, arch: @arch)
@@ -143,6 +145,7 @@ def statistics
   def binary
     @arch = Architecture.find_by_name(params[:arch]).name
     @repository = params[:repository]
+    @package_name = params[:package]
     # Ensure it really is just a file name, no '/..', etc.
     @filename = File.basename(params[:filename])
 

diff --git a/src/api/app/helpers/webui/package_helper.rb b/src/api/app/helpers/webui/package_helper.rb
@@ -47,7 +47,7 @@ def guess_code_class(filename)
   include Webui::ProjectHelper
 
   def package_bread_crumb(*args)
-    args.insert(0, link_to_if(params['action'] != 'show', @package,
+    args.insert(0, link_to_if(params['action'] != 'show', @package_name || @package,
                               controller: :package, action: :show,
                               project: @project, package: @package))
     project_bread_crumb(*args)

diff --git a/src/api/app/views/webui/packages/build_reason/index.html.haml b/src/api/app/views/webui/packages/build_reason/index.html.haml
@@ -1,7 +1,7 @@
 :ruby
   @pagetitle = "Build Reason for #{@project} / #{@package_name}"
   @metarobots = 'index,nofollow'
-  build_reason_breadcrumb(@project, @package, "Build Reason (#{@repository.name} / #{params[:arch]})")
+  build_reason_breadcrumb(@project, @package_name, "Build Reason (#{@repository.name} / #{params[:arch]})")
 
 = render partial: 'webui/package/tabs'
 

diff --git a/src/api/app/views/webui/packages/job_history/index.html.haml b/src/api/app/views/webui/packages/job_history/index.html.haml
@@ -1,7 +1,7 @@
 :ruby
   @pagetitle = "Job history of #{@project} / #{@package_name}"
   @metarobots = 'index,nofollow'
-  job_history_breadcrumb(@project, @package, 'Job history')
+  job_history_breadcrumb(@project, @package_name, 'Job history')
 
 = render partial: 'webui/package/tabs'