[webui] Fix display of groups and globalrole

openSUSE · May 15, 2013 · fa0d0e8 · fa0d0e8
1 parent 1bc70b4
commit fa0d0e8
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/ReleaseNotes-2.4.2 b/ReleaseNotes-2.4.2
@@ -36,4 +36,5 @@ Bugfixes:
 * build: rpm packages get installed again without fsync which speeds up the installation
 * backend: fixed binary rpm cache handling for image building via interconnect
 * webui: fixed change password dialog
+* webui: fixed display of groups and globalrole
 
diff --git a/src/webui/app/models/person.rb b/src/webui/app/models/person.rb
@@ -69,7 +69,11 @@ def login
   end
 
   def globalrole
-    self.to_hash["globalrole"]
+    roles = Array.new
+    to_hash.elements("globalrole").each do |role|
+      roles << role
+    end
+    roles if roles.length > 0
   end
 
   def to_str

diff --git a/src/webui/app/views/home/index.html.erb b/src/webui/app/views/home/index.html.erb
@@ -4,9 +4,9 @@
 
 <!-- user -->
 <div class="grid_4 alpha box box-shadow" id="userinfo">
-  <!-- avatar -->
+<!-- avatar -->
   <%= user_icon(@displayed_user.login, 200, 'home-avatar') if @displayed_user.email %>
-  <!-- info -->
+<!-- info -->
     <h1>
     <span id="home-realname">
     <% if @displayed_user.realname && !@displayed_user.realname.to_s.empty? %>
@@ -15,29 +15,31 @@
     </span>
     <span id="home-username"><%= @displayed_user.login if @displayed_user.login %></span>
     </h1>
+<!-- mail -->
     <p>
     <% mail_to = 'mailto:' + @displayed_user.email %>
     <%= link_to(image_tag('email.png', :alt => "Send mail", :title => "Send mail to user"), mail_to) %>
     <%= mail_to(@displayed_user.email, nil, :title => "Send mail to user") %>
     </p>
+<!--  groups -->
     <% if not @displayed_user.groups.empty? %>
-    <h6>Member of</h6>
-      <ul>
+    <p>Member of the group</p>
+    <ul>
       <% @displayed_user.groups.each do |group| %>
         <li><%= link_to(group, :controller => 'group', :action => 'show', :group => group) %></li>
       <% end %>
+    </ul>
     <% end %>
-    <% if @displayed_user.globalrole && !@displayed_user.globalrole.to_s.empty? %>
-      <% if @displayed_user.groups.empty? %>
-      <h6>Member of</h6>
+<!-- roles -->
+    <% if @displayed_user.globalrole %>
+      <p>Has the role</p>
       <ul>
-      <% end %>
-        <% @displayed_user.globalrole.each do |role| %>
+      <% @displayed_user.globalrole.each do |role| %>
           <li><%= role %></li>
         <% end %>
       </ul>
     <% end %>
-  <!-- roles -->
+<!-- edit -->
     <% if @user and @displayed_user.to_s == @user.login %>
       <p>
       <% if CONFIG['proxy_auth_mode'] == :on %>

diff --git a/src/webui/app/views/user/edit.html.erb b/src/webui/app/views/user/edit.html.erb
@@ -18,11 +18,13 @@
     </p>
     <p>
     <% @roles.each do |r| %>
-      <%= label_tag "globalrole_#{r}", "#{r}" %>
-      <% if r.to_s == @displayed_user.globalrole.to_s %>
-        <% select = true %>
+      <% if @displayed_user.globalrole %>
+        <%= label_tag "globalrole_#{r}", "#{r}" %>
+        <% if @displayed_user.globalrole.include?(r) %>
+          <% select = true %>
+        <% end %>
+        <%= radio_button_tag :globalrole, r, select %>
       <% end %>
-      <%= radio_button_tag :globalrole, r, select %>
     <% end %>
     </p>
     <p>