[Rt-commit] r4021 - in rtir/branches/1.9-EXPERIMENTAL: . html/RTIR
html/RTIR/Elements html/RTIR/Incident html/RTIR/Report lib/RT/Action
ruz at bestpractical.com
ruz at bestpractical.com
Thu Nov 3 16:42:51 EST 2005
Author: ruz
Date: Thu Nov 3 16:42:50 2005
New Revision: 4021
Modified:
rtir/branches/1.9-EXPERIMENTAL/ (props changed)
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Create.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Edit.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html
rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ChangeChildOwnership.pm
rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ChangeParentOwnership.pm
Log:
r255 at cubic-pc: cubic | 2005-11-03 16:49:26 +0300
r248 at cubic-pc: cubic | 2005-11-01 16:18:19 +0300
r247 at cubic-pc: cubic | 2005-11-01 16:17:41 +0300
* $ticket->OwnerObj->id equivalent to $ticket->Owner,
there is no known reason to use first variant in RT
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html Thu Nov 3 16:42:50 2005
@@ -65,7 +65,7 @@
<&|/l&>Owner</&>:
</TD>
<TD>
- <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->OwnerObj->Id &>
+ <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->Owner &>
</TD>
</TR>
<tr>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/QueueTabs Thu Nov 3 16:42:50 2005
@@ -175,11 +175,11 @@
}
if ( $Ticket->CurrentUserHasRight('OwnTicket') ) {
- if ( $Ticket->OwnerObj->id == $RT::Nobody->id ) {
+ if ( $Ticket->Owner == $RT::Nobody->id ) {
$actions->{'D'} = { path => "RTIR/Display.html?Action=Take&id=" . $id,
title => loc('Take') };
}
- elsif ( $Ticket->OwnerObj->id != $session{CurrentUser}->id ) {
+ elsif ( $Ticket->Owner != $session{CurrentUser}->id ) {
$actions->{'E'} = {path => "RTIR/Display.html?Action=Steal&id=" . $id,
title => loc('Steal') };
}
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Create.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Create.html Thu Nov 3 16:42:50 2005
@@ -62,7 +62,7 @@
% if ($ChildObj) {
<td class="label"><&|/l&>Owner</&>:</td>
<td class="value"><%$ChildObj->OwnerObj->Name%></td>
- <input type=hidden name="Owner" value=<%$ChildObj->OwnerObj->id%>>
+ <input type=hidden name="Owner" value=<%$ChildObj->Owner%>>
% } else {
<TD class=label>
<&|/l&>Owner</&>:
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Display.html Thu Nov 3 16:42:50 2005
@@ -236,8 +236,8 @@
}
# If we don't own the thing we're linking to, change the owner
- if ($Ticket->OwnerObj->id != $session{'CurrentUser'}->id) {
- if ($Ticket->OwnerObj->id == $RT::Nobody->id) {
+ if ($Ticket->Owner != $session{'CurrentUser'}->id) {
+ if ($Ticket->Owner == $RT::Nobody->id) {
$ARGS{'Action'} = 'Take';
} else {
$ARGS{'Action'} = 'Steal';
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Edit.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Edit.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Edit.html Thu Nov 3 16:42:50 2005
@@ -61,7 +61,7 @@
<&|/l&>Owner</&>:
</td>
<td class="value">
- <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->OwnerObj->Id &>
+ <& /Elements/SelectOwner, Name => 'Owner', QueueObj => $Ticket->QueueObj, TicketObj => $Ticket, Default => $Ticket->Owner &>
</td>
</tr>
<tr>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Report/BulkReject.html Thu Nov 3 16:42:50 2005
@@ -90,8 +90,8 @@
}
# If we don't own the thing we're linking to, change the owner
- if ( $t->OwnerObj->id != $session{'CurrentUser'}->id
- && $t->OwnerObj->id != $RT::Nobody->id )
+ if ( $t->Owner != $session{'CurrentUser'}->id
+ && $t->Owner != $RT::Nobody->id )
{
push @tempresults, [
$id,
@@ -100,8 +100,8 @@
next;
}
- if ( $t->OwnerObj->id != $session{'CurrentUser'}->id &&
- $t->OwnerObj->id == $RT::Nobody->id ) {
+ if ( $t->Owner != $session{'CurrentUser'}->id &&
+ $t->Owner == $RT::Nobody->id ) {
my $action = $ARGS{'Action'} = 'Take';
push @tempresults, [ $id, loc("Action: ") . $ARGS{'Action'} ];
my ( $res, $msg ) = $t->$action();
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Update.html Thu Nov 3 16:42:50 2005
@@ -84,7 +84,7 @@
</td><td>
<& /Elements/SelectOwner,
Name=>"Owner",
- Default => ($ARGS{Owner}||$Ticket->OwnerObj->Id()||$session{'CurrentUser'}->Id||undef),
+ Default => ($ARGS{Owner}||$Ticket->Owner()||$session{'CurrentUser'}->Id||undef),
QueueObj => $Ticket->QueueObj,
TicketObj => $Ticket &>
<&|/l&>Worked</&>: <input size=4 name="UpdateTimeWorked" value="<%
Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ChangeChildOwnership.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ChangeChildOwnership.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ChangeChildOwnership.pm Thu Nov 3 16:42:50 2005
@@ -79,7 +79,7 @@
# change owner of child Incident Reports, Investigations, Blocks
while (my $member = $members->Next) {
- if ($member->OwnerObj->id != $self->TransactionObj->NewValue) {
+ if ($member->Owner != $self->TransactionObj->NewValue) {
my ($res, $msg);
my $user = new RT::CurrentUser($self->TransactionObj->CurrentUser);
$user->Load($self->TransactionObj->Creator);
Modified: rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ChangeParentOwnership.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ChangeParentOwnership.pm (original)
+++ rtir/branches/1.9-EXPERIMENTAL/lib/RT/Action/RTIR_ChangeParentOwnership.pm Thu Nov 3 16:42:50 2005
@@ -78,7 +78,7 @@
my $parents = new RT::Tickets($self->TransactionObj->CurrentUser);
$parents->FromSQL($query);
while (my $incident = $parents->Next) {
- if ( $incident->OwnerObj->id != $self->TransactionObj->NewValue) {
+ if ( $incident->Owner != $self->TransactionObj->NewValue) {
my ($res, $msg);
my $user = new RT::CurrentUser($self->TransactionObj->CurrentUser);
$user->Load($self->TransactionObj->Creator);
More information about the Rt-commit
mailing list