Merge pull request #1342 from ChrisBr/2.6

[webui] Fix user show queries
openSUSE · Nov 5, 2015 · a42c0f7 · a42c0f7
2 parents 405b250 + 4e45f41
commit a42c0f7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/api/app/controllers/webui/user_controller.rb b/src/api/app/controllers/webui/user_controller.rb
@@ -70,7 +70,7 @@ def show
         redirect_to :back, error: "User not found #{params['user']}"
       end
     end
-    @iprojects = @displayed_user.involved_projects.select(:name, :title)
+    @iprojects = @displayed_user.involved_projects.pluck(:name, :title)
     @ipackages = @displayed_user.involved_packages.joins(:project).pluck(:name, 'projects.name as pname')
     @owned = @displayed_user.owned_packages
 

diff --git a/src/api/app/models/user.rb b/src/api/app/models/user.rb
@@ -755,7 +755,7 @@ def owned_packages
     owned = []
     begin
       Owner.search({}, self).each do |owner|
-        owned << [owner.project, owner.package]
+        owned << [owner.package, owner.project]
       end
     rescue APIException => e # no attribute set
       Rails.logger.debug "0wned #{e.inspect}"