[webui] Fix multibuild binary view

We were using the `Package` object for the multibuild view, but the multibuild is just a name, that's why the cointainer was shown. Now the multibuild package name is given to the backend call to get the correct results. I also updated the links in the view, except by the `Job History`, as this view only exist for the container at the moment.
openSUSE · May 3, 2018 · aca831a · aca831a
1 parent d51ba31
commit aca831a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/api/app/controllers/webui/package_controller.rb b/src/api/app/controllers/webui/package_controller.rb
@@ -169,10 +169,11 @@ def binary
 
   def binaries
     @repository = params[:repository]
+    @package_name = params[:package]
 
-    results_from_backend = Buildresult.find_hashed(project: @project, package: @package, repository: @repository, view: ['binarylist', 'status'])
+    results_from_backend = Buildresult.find_hashed(project: @project, package: @package_name, repository: @repository, view: ['binarylist', 'status'])
     unless results_from_backend
-      flash[:error] = "Package \"#{@package}\" has no build result for repository #{@repository}"
+      flash[:error] = "Package \"#{@package_name}\" has no build result for repository #{@repository}"
       redirect_to(controller: :package, action: :show, project: @project, package: @package, nextstatus: 404)
       return
     end

diff --git a/src/api/app/views/webui/package/binaries.html.erb b/src/api/app/views/webui/package/binaries.html.erb
@@ -1,4 +1,4 @@
-<% @pagetitle = "State of Repository #{@repository} for #{@project} / #{@package}"
+<% @pagetitle = "State of Repository #{@repository} for #{@project} / #{@package_name}"
    @metarobots = 'index,nofollow' # do not follow the single binary pages
    package_bread_crumb 'Repository State'
 -%>
@@ -10,7 +10,7 @@
 <p>
   <%= render partial: "shared/download_repository_link", locals: { project: @project, repository: @repository} %>
   <% unless @buildresults.empty? %>
-    <%= link_to sprited_text('drive_burn', 'Delete'), { controller: :package, action: :wipe_binaries, project: @project, package: @package, repository: @repository }, { method: :delete} %> all built binaries
+    <%= link_to sprited_text('drive_burn', 'Delete'), { controller: :package, action: :wipe_binaries, project: @project, package: @package_name, repository: @repository }, { method: :delete} %> all built binaries
   <% end %>
 </p>
 
@@ -26,23 +26,23 @@
           <span class="binaries_links">
             <%= link_to(sprited_text('page_white_get', 'Cloud Upload'), new_cloud_upload_path(project: @project, package: @package, repository: @repository, arch: result[:arch], filename: binary[:filename])) if binary[:links][:cloud_upload?] %>
             <%= link_to(sprited_text('page_white_put', 'Download'), binary[:links][:download_url]) if binary[:links][:download_url] %>
-            <%= link_to(sprited_text('information', 'Details'), package_binary_path(project: @project, package: @package, repository: @repository, arch: result[:arch], filename: binary[:filename])) if binary[:links][:details?] %>
+            <%= link_to(sprited_text('information', 'Details'), package_binary_path(project: @project, package: @package_name, repository: @repository, arch: result[:arch], filename: binary[:filename])) if binary[:links][:details?] %>
           </span>
         </li>
       <% end %>
     </ul>
   <% end %>
   <p>
     <% if User.current.can_modify_package?(@package) %>
-      <%= link_to sprited_text('rebuild', 'Trigger'), { controller: :package, action: :trigger_rebuild, arch: result[:arch], project: @project, package: @package, repository: @repository }, { method: :post } %> rebuild
+      <%= link_to sprited_text('rebuild', 'Trigger'), { controller: :package, action: :trigger_rebuild, arch: result[:arch], project: @project, package: @package_name, repository: @repository }, { method: :post } %> rebuild
       <% unless result[:binaries].empty? %>
-        <%= link_to sprited_text('drive_burn', 'Delete'), { controller: :package, action: :wipe_binaries, arch: result[:arch], project: @project, package: @package, repository: @repository }, { method: :delete} %> built binaries
+        <%= link_to sprited_text('drive_burn', 'Delete'), { controller: :package, action: :wipe_binaries, arch: result[:arch], project: @project, package: @package_name, repository: @repository }, { method: :delete} %> built binaries
       <% end %>
     <% end %>
     <% if result[:statistics] %>
-      <%= link_to sprited_text('server_chart', 'Show'), package_statistics_path(project: @project, package: @package, repository: @repository, arch: result[:arch]) %> used resources
+      <%= link_to sprited_text('server_chart', 'Show'), package_statistics_path(project: @project, package: @package_name, repository: @repository, arch: result[:arch]) %> used resources
     <% end %>
     <%= link_to sprited_text('text_indent', 'Job history'), index_package_job_history_path(project: @project, package_name: @package, repository: @repository, arch: result[:arch]), class: '' %> list
-    <%= link_to sprited_text('information', 'Build Reason'), index_package_build_reason_path(project: @project, package_name: @package, repository: @repository, arch: result[:arch]), class: '' %>
+    <%= link_to sprited_text('information', 'Build Reason'), index_package_build_reason_path(project: @project, package_name: @package_name, repository: @repository, arch: result[:arch]), class: '' %>
   </p>
 <% end %>