[Rt-commit] r19030 - in rt/3.999/trunk/share/html: Admin/CustomFields Admin/Elements Admin/Queues REST/1.0/Forms/group Ticket/Elements
ruz at bestpractical.com
ruz at bestpractical.com
Thu Apr 2 06:53:50 EDT 2009
Author: ruz
Date: Thu Apr 2 06:53:09 2009
New Revision: 19030
Modified:
rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html
rt/3.999/trunk/share/html/Admin/Elements/EditQueueWatchers
rt/3.999/trunk/share/html/Admin/Groups/Members.html
rt/3.999/trunk/share/html/Admin/Groups/UserRights.html
rt/3.999/trunk/share/html/Admin/Queues/UserRights.html
rt/3.999/trunk/share/html/REST/1.0/Forms/group/default
rt/3.999/trunk/share/html/Ticket/Elements/EditWatchers
Log:
* last member_obj and group_obj
Modified: rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html (original)
+++ rt/3.999/trunk/share/html/Admin/CustomFields/UserRights.html Thu Apr 2 06:53:09 2009
@@ -58,9 +58,9 @@
<table>
% while (my $Member = $Users->next()) {
-% my $user_object = $Member->member_obj->object();
+% my $user_object = $Member->member->object();
% my $group = RT::Model::Group->new( current_user => Jifty->web->current_user );
-% $group->load_acl_equivalence($Member->member_obj);
+% $group->load_acl_equivalence($Member->member);
<tr align="right">
<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
<td>
Modified: rt/3.999/trunk/share/html/Admin/Elements/EditQueueWatchers
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Elements/EditQueueWatchers (original)
+++ rt/3.999/trunk/share/html/Admin/Elements/EditQueueWatchers Thu Apr 2 06:53:09 2009
@@ -54,12 +54,12 @@
<li>
<input type="checkbox" class="checkbox" name="Queue-<%$queue_obj->id%>-DeleteWatcher-Type-<%$watchers->type%>-Principal-<%$watcher->member_id%>" value="1"
unchecked />
-% if ($watcher->member_obj->is_user) {
-<a href="<%RT->config->get('WebPath')%>/Admin/Users/Modify.html?id=<%$watcher->member_obj->object_id%>">
+% if ($watcher->member->is_user) {
+<a href="<%RT->config->get('WebPath')%>/Admin/Users/Modify.html?id=<%$watcher->member->object_id%>">
% } else {
-<a href="<%RT->config->get('WebPath')%>/Admin/Groups/Modify.html?id=<%$watcher->member_obj->object_id%>">
+<a href="<%RT->config->get('WebPath')%>/Admin/Groups/Modify.html?id=<%$watcher->member->object_id%>">
% }
-<%$watcher->member_obj->object->name%></a>
+<%$watcher->member->object->name%></a>
% }
% }
</ul>
Modified: rt/3.999/trunk/share/html/Admin/Groups/Members.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Groups/Members.html (original)
+++ rt/3.999/trunk/share/html/Admin/Groups/Members.html Thu Apr 2 06:53:09 2009
@@ -90,7 +90,7 @@
% while ( my $member = $GroupMembers->next ) {
% $GroupsSeen{ $member->member_id } = 1 if $skip_seen_groups;
<li><input type="checkbox" class="checkbox" name="delete_member-<% $member->member_id %>" value="1" />
-<% $member->member_obj->object->name %>
+<% $member->member->object->name %>
% }
</ul>
% }
Modified: rt/3.999/trunk/share/html/Admin/Groups/UserRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Groups/UserRights.html (original)
+++ rt/3.999/trunk/share/html/Admin/Groups/UserRights.html Thu Apr 2 06:53:09 2009
@@ -58,11 +58,11 @@
<&| /Widgets/TitleBox, title => _('Modify user rights for group %1', $GroupObj->name) &>
<table>
% while ( my $Member = $Users->next ) {
-% my $user_object = $Member->member_obj->object;
+% my $user_object = $Member->member->object;
<tr align="right">
<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
<td><& /Admin/Elements/SelectRights,
- principal => $Member->member_obj->id,
+ principal => $Member->member->id,
type => 'User',
object => $GroupObj,
&></td>
Modified: rt/3.999/trunk/share/html/Admin/Queues/UserRights.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Queues/UserRights.html (original)
+++ rt/3.999/trunk/share/html/Admin/Queues/UserRights.html Thu Apr 2 06:53:09 2009
@@ -59,9 +59,9 @@
<table>
% $m->callback( %ARGS, queue_obj => $queue_obj, results => \@results );
% while (my $Member = $Users->next()) {
-% my $user_object = $Member->member_obj->object();
+% my $user_object = $Member->member->object();
% my $group = RT::Model::Group->new( current_user => Jifty->web->current_user );
-% $group->load_acl_equivalence($Member->member_obj);
+% $group->load_acl_equivalence($Member->member);
<tr align="right">
<td valign="top"><& /Elements/ShowUser, user => $user_object &></td>
<td>
Modified: rt/3.999/trunk/share/html/REST/1.0/Forms/group/default
==============================================================================
--- rt/3.999/trunk/share/html/REST/1.0/Forms/group/default (original)
+++ rt/3.999/trunk/share/html/REST/1.0/Forms/group/default Thu Apr 2 06:53:09 2009
@@ -117,20 +117,20 @@
my $gms = [];
my $GroupMembers = $group->members;
while ( my $mo = $GroupMembers->next() ) {
- if ( $mo->member_obj->is_group ) {
- my $us = $mo->member_obj->object->user_members;
+ if ( $mo->member->is_group ) {
+ my $us = $mo->member->object->user_members;
my @users;
while ( my $u = $us->next() ) {
push @users, $u->real_name . ' <' . $u->email . '>';
}
push @$gms,
'GROUP ['
- . $mo->member_obj->object->name . ']' . ' ('
+ . $mo->member->object->name . ']' . ' ('
. join( ';', @users ) . ')';
- } elsif ( $mo->member_obj->is_user ) {
+ } elsif ( $mo->member->is_user ) {
push @$gms,
- $mo->member_obj->object->real_name . ' <'
- . $mo->member_obj->object->email . '>';
+ $mo->member->object->real_name . ' <'
+ . $mo->member->object->email . '>';
}
}
push @data, [ Members => $gms ];
Modified: rt/3.999/trunk/share/html/Ticket/Elements/EditWatchers
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/EditWatchers (original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/EditWatchers Thu Apr 2 06:53:09 2009
@@ -53,7 +53,7 @@
% while ( my $watcher = $Members->next ) {
-% my $member = $watcher->member_obj->object;
+% my $member = $watcher->member->object;
<li>
<input type="checkbox" class="checkbox" name="Ticket-DeleteWatcher-Type-<% $watchers->type %>-Principal-<% $watcher->member_id %>" value="1" unchecked />
% if ( $member->isa( 'RT::Model::User' ) ) {
More information about the Rt-commit
mailing list