jro_apps/redmine Commit - r10462:7729178d9d50

Adds links to locked users when current user is admin....

Jean-Philippe Lang -

r10462:7729178d9d50

parent child

Context file:

r10462:7729178d9d50

app/helpers/application_helper.rb +2 -2

                def link_to_user(user, options={})
                  if user.is_a?(User)
                    name = h(user.name(options[:format]))
-                   if user.active?
-                     link_to name, :controller => 'users', :action => 'show', :id => user
+                   if user.active? || (User.current.admin? && user.logged?)
+                     link_to name, {:controller => 'users', :action => 'show', :id => user}, :class => user.css_classes
                    else
                      name
                    end

app/models/user.rb +11 0

                  name
                end
+               CSS_CLASS_BY_STATUS = {
+                 STATUS_ANONYMOUS  => 'anon',
+                 STATUS_ACTIVE     => 'active',
+                 STATUS_REGISTERED => 'registered',
+                 STATUS_LOCKED     => 'locked'
+               }
+               def css_classes
+                 "user #{CSS_CLASS_BY_STATUS[status]}"
+               end
                # Returns the current day according to user's time zone
                def today
                  if time_zone.nil?

app/views/users/index.html.erb +1 -1

                </tr></thead>
                <tbody>
              <% for user in @users -%>
-               <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
+               <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
                <td class="username"><%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %></td>
                <td class="firstname"><%= h(user.firstname) %></td>
                <td class="lastname"><%= h(user.lastname) %></td>

public/stylesheets/application.css +1 0

              a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
              a.project.closed, a.project.closed:link, a.project.closed:visited { color: #999; }
+             a.user.locked, a.user.locked:link, a.user.locked:visited {color: #999;}
              #sidebar a.selected {line-height:1.7em; padding:1px 3px 2px 2px; margin-left:-2px; background-color:#9DB9D5; color:#fff; border-radius:2px;}
              #sidebar a.selected:hover {text-decoration:none;}

test/test_helper.rb +9 0

                  saved_settings.each {|k, v| Setting[k] = v} if saved_settings
                end
+               # Yields the block with user as the current user
+               def with_current_user(user, &block)
+                 saved_user = User.current
+                 User.current = user
+                 yield
+               ensure
+                 User.current = saved_user
+               end
                def change_user_password(login, new_password)
                  user = User.first(:conditions => {:login => login})
                  user.password, user.password_confirmation = new_password, new_password

test/unit/helpers/application_helper_test.rb +12 -4

                def test_link_to_user
                  user = User.find(2)
-                 t = link_to_user(user)
-                 assert_equal "<a href=\"/users/2\">#{ user.name }</a>", t
+                 assert_equal '<a href="/users/2" class="user active">John Smith</a>', link_to_user(user)
                end
                def test_link_to_user_should_not_link_to_locked_user
+                 with_current_user nil do
                  user = User.find(5)
                  assert user.locked?
-                 t = link_to_user(user)
-                 assert_equal user.name, t
+                   assert_equal 'Dave2 Lopper2', link_to_user(user)
+                 end
+               end
+               def test_link_to_user_should_link_to_locked_user_if_current_user_is_admin
+                 with_current_user User.find(1) do
+                   user = User.find(5)
+                   assert user.locked?
+                   assert_equal '<a href="/users/5" class="user locked">Dave2 Lopper2</a>', link_to_user(user)
+                 end
                end
                def test_link_to_user_should_not_link_to_anonymous

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages