[Rt-commit] rt branch, 4.0/admin-links-in-modify-people-fix, updated. rt-4.0.0-268-g666e9c5

[? sunnavy]

The branch, 4.0/admin-links-in-modify-people-fix has been updated
       via  666e9c5a5cf82b91d7b0b06d1e607cab12d5be9b (commit)
      from  e896ce1fca19a1d0afbb59615a16e4c599997430 (commit)

Summary of changes:
 share/html/Ticket/Elements/EditWatchers |    8 +++++++-
 t/web/ticket_modify_people.t            |    5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 666e9c5a5cf82b91d7b0b06d1e607cab12d5be9b
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Thu May 19 07:52:10 2011 +0800

    we definitely want to show user/group info, just without admin links if no proper rights

diff --git a/share/html/Ticket/Elements/EditWatchers b/share/html/Ticket/Elements/EditWatchers
index cd82b4a..ae4d9b2 100755
--- a/share/html/Ticket/Elements/EditWatchers
+++ b/share/html/Ticket/Elements/EditWatchers
@@ -61,13 +61,19 @@
 %      $session{CurrentUser}->HasRight( Right => 'ShowConfigTab', Object =>$RT::System ) ) {
 <a href="<% RT->Config->Get('WebPath') %>/Admin/Users/Modify.html?id=<% $watcher->MemberId %>">
 <& /Elements/ShowUser, User => $member &></a> <& /Elements/ShowUserEmailFrequency, User => $member, Ticket => $TicketObj &>
-% }} else {
+% } else {
+<& /Elements/ShowUser, User => $member &> <& /Elements/ShowUserEmailFrequency, User => $member, Ticket => $TicketObj &>
+% } }
+% else {
 % if ( $session{CurrentUser}->HasRight( Right => 'AdminGroup', Object => $RT::System ) &&
 %      $session{CurrentUser}->HasRight( Right => 'ShowConfigTab', Object =>$RT::System ) ) {
 <a href="<% RT->Config->Get('WebPath') %>/Admin/Groups/Modify.html?id=<% $watcher->MemberId %>">
 <% $member->Name %>
 </a>
+% } else {
+<% $member->Name %>
 % } }
+
 </li>
 % }
 </ul>
diff --git a/t/web/ticket_modify_people.t b/t/web/ticket_modify_people.t
index c0c27d6..451cfdc 100644
--- a/t/web/ticket_modify_people.t
+++ b/t/web/ticket_modify_people.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 20;
+use RT::Test tests => 22;
 
 my $root = RT::Test->load_or_create_user( Name => 'root' );
 my $group_foo = RT::Group->new($RT::SystemUser);
@@ -42,6 +42,7 @@ ok(
     ),
     'no link to modify user'
 );
+$m->content_contains('Enoch Root', 'still has the user name' );
 
 ok(
     !$m->find_link(
@@ -51,6 +52,8 @@ ok(
     'no link to modify group'
 );
 
+$m->content_contains('group_foo', 'still has the group name' );
+
 ok( RT::Test->add_rights( { Principal => $user, Right => ['AdminUsers'] }, ),
     'added AdminUsers right' );
 $m->reload;

-----------------------------------------------------------------------