Mailinglist Archive: obs-commits (345 mails)

[OBS build-service <opensuse-buildservice@xxxxxxxxxxxx>]

From: Sascha Peilicke <saschpe@xxxxxxx>

---
 src/webui/app/controllers/package_controller.rb    |    2 +-
 src/webui/app/models/package.rb                    |    2 +-
 .../app/views/shared/_involved_users.html.erb      |    5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/webui/app/controllers/package_controller.rb 
b/src/webui/app/controllers/package_controller.rb
index f85a0e2..3b817d7 100644
--- a/src/webui/app/controllers/package_controller.rb
+++ b/src/webui/app/controllers/package_controller.rb
@@ -108,7 +108,7 @@ class PackageController < ApplicationController
 
   def users
     @users = [@project.users, @package.users].flatten.uniq
-    @groups = @project.groups
+    @groups = [@project.groups, @package.groups].flatten.uniq
     @roles = Role.local_roles
   end
 
diff --git a/src/webui/app/models/package.rb b/src/webui/app/models/package.rb
index 572091f..9fca326 100644
--- a/src/webui/app/models/package.rb
+++ b/src/webui/app/models/package.rb
@@ -177,7 +177,7 @@ class Package < ActiveXML::Base
     groups = []
     each_group do |g|
       if not role or (role and g.role == role)
-        groups << g.groupd
+        groups << g.groupid
       end
     end
     return groups.sort.uniq
diff --git a/src/webui/app/views/shared/_involved_users.html.erb 
b/src/webui/app/views/shared/_involved_users.html.erb
index 712e6dd..ef6c8b0 100644
--- a/src/webui/app/views/shared/_involved_users.html.erb
+++ b/src/webui/app/views/shared/_involved_users.html.erb
@@ -133,7 +133,10 @@
             <% @roles.each do |role| %>
               <td>
                 <% if defined? @package %>
-                  <%= check_box_tag("group_" + role + "_" + group, '', 
@package.group_has_role?(group, role) || @project.group_has_role?(group, role), 
:disabled => true, :class => :trigger) %>
+                  <%= check_box_tag("group_" + role + "_" + group, '', 
@package.group_has_role?(group, role), :disabled => true, :class => :trigger) %>
+                  <% if @project.group_has_role?(group, role) %>
+                    <%= link_to(image_tag('project.png', :alt => "Inherited 
from project", :title => "Inherited from project"), :controller => "project", 
:action => "users", :project => @project) %>
+                  <% end %>
                 <% else %>
                   <%= check_box_tag("group_" + role + "_" + group, '', 
@project.group_has_role?(group, role), :disabled => true, :class => :trigger) %>
                 <% end %>
-- 
1.7.7

-- 
To unsubscribe, e-mail: obs-commits+unsubscribe@xxxxxxxxxxxx
To contact the owner, e-mail: obs-commits+owner@xxxxxxxxxxxx