[Rt-commit] r4719 - in rtir/branches/1.9-EXPERIMENTAL: . etc
html/RTIR html/RTIR/Investigation/Elements
alexmv at bestpractical.com
alexmv at bestpractical.com
Thu Mar 9 00:09:37 EST 2006
Author: alexmv
Date: Thu Mar 9 00:09:36 2006
New Revision: 4719
Modified:
rtir/branches/1.9-EXPERIMENTAL/ (props changed)
rtir/branches/1.9-EXPERIMENTAL/etc/initialdata
rtir/branches/1.9-EXPERIMENTAL/etc/upgrade/1.9.0/content
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Edit.html
rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Investigation/Elements/Create
Log:
r8465 at zoq-fot-pik: chmrr | 2006-03-09 00:09:29 -0500
* Add 'customer' RTIR cf
Modified: rtir/branches/1.9-EXPERIMENTAL/etc/initialdata
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/etc/initialdata (original)
+++ rtir/branches/1.9-EXPERIMENTAL/etc/initialdata Thu Mar 9 00:09:36 2006
@@ -283,6 +283,20 @@
Queue => 'Blocks',
Disabled => 0,
},
+ {
+ Name => '_RTIR_Customer',
+ Type => 'SelectMultiple',
+ Queue => 'Incident Reports',
+ Disabled => 0,
+ Values => [ ],
+ },
+ {
+ Name => '_RTIR_Customer',
+ Type => 'SelectSingle',
+ Queue => 'Investigations',
+ Disabled => 0,
+ Values => [ ],
+ },
);
@ScripActions = (
Modified: rtir/branches/1.9-EXPERIMENTAL/etc/upgrade/1.9.0/content
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/etc/upgrade/1.9.0/content (original)
+++ rtir/branches/1.9-EXPERIMENTAL/etc/upgrade/1.9.0/content Thu Mar 9 00:09:36 2006
@@ -19,6 +19,20 @@
},
],
},
+ {
+ Name => '_RTIR_Customer',
+ Type => 'SelectMultiple',
+ Queue => 'Incident Reports',
+ Disabled => 0,
+ Values => [ ],
+ },
+ {
+ Name => '_RTIR_Customer',
+ Type => 'SelectSingle',
+ Queue => 'Investigations',
+ Disabled => 0,
+ Values => [ ],
+ },
);
# all CustomFields to update ACLs
@@ -87,6 +101,14 @@
Name => '_RTIR_WhereBlocked',
Queue => 'Blocks',
},
+ {
+ Name => '_RTIR_Customer',
+ Queue => 'Incident Reports',
+ },
+ {
+ Name => '_RTIR_Customer',
+ Queue => 'Investigations',
+ },
);
for my $cf (@CustomFieldsList) {
push @ACL, (
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Create.html Thu Mar 9 00:09:36 2006
@@ -161,6 +161,14 @@
</td>
</tr>
<tr>
+ <td class="labeltop"><&|/l&>Customer</&>:</td>
+ <td class="value">
+ <& /RTIR/Elements/EditRTIRField,
+ QueueObj => $QueueObj,
+ Name => 'Customer' &>
+ </td>
+ </tr>
+ <tr>
<td class="labeltop">
<%loc("How Reported")%>:
</td>
@@ -234,6 +242,15 @@
Default => $ARGS{'WhereBlocked-Value'} || RT->Config->Get('_RTIR_WhereBlocked_default'), &>
</td>
</tr>
+% } elsif ($Type eq "Investigation") {
+ <tr>
+ <td class="labeltop"><&|/l&>Customer</&>:</td>
+ <td class="value">
+ <& /RTIR/Elements/EditRTIRField,
+ QueueObj => $QueueObj,
+ Name => 'Customer' &>
+ </td>
+ </tr>
% }
<tr>
<td colspan="2">
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Display.html Thu Mar 9 00:09:36 2006
@@ -62,6 +62,20 @@
</tr>
% if ($Type eq 'Report') {
<tr>
+ <td class="label"><&|/l&>SLA</&>:</td>
+ <td class="value">
+ <& /RTIR/Elements/ShowRTIRField,
+ Ticket => $Ticket, Name => 'SLA' &>
+ </td>
+ </tr>
+ <tr>
+ <td class="label"><&|/l&>Customer</&>:</td>
+ <td class="value">
+ <& /RTIR/Elements/ShowRTIRField,
+ Ticket => $Ticket, Name => 'Customer' &>
+ </td>
+ </tr>
+ <tr>
<td class="label">
<%loc("How Reported")%>:
</td>
@@ -79,13 +93,6 @@
Ticket => $Ticket, Name => 'ReporterType' &>
</td>
</tr>
- <tr>
- <td class="label"><&|/l&>SLA</&>:</td>
- <td class="value">
- <& /RTIR/Elements/ShowRTIRField,
- Ticket => $Ticket, Name => 'SLA' &>
- </td>
- </tr>
% } elsif ($Type eq "Block") {
<tr>
<td class="label"><&|/l&>IP Address</&>:</td>
@@ -119,6 +126,14 @@
Name => 'WhereBlocked' &>
</td>
</tr>
+% } elsif ($Type eq "Investigation") {
+ <tr>
+ <td class="label"><&|/l&>Customer</&>:</td>
+ <td class="value">
+ <& /RTIR/Elements/ShowRTIRField,
+ Ticket => $Ticket, Name => 'Customer' &>
+ </td>
+ </tr>
% }
</table>
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 Mar 9 00:09:36 2006
@@ -91,6 +91,14 @@
</td>
</tr>
<tr>
+ <td class="labeltop"><&|/l&>Customer</&>:</td>
+ <td class="value">
+ <& /RTIR/Elements/EditRTIRField,
+ TicketObj => $Ticket,
+ Name => 'Customer' &>
+ </td>
+ </tr>
+ <tr>
<td class="labeltop">
<%loc("How Reported")%>:
</td>
@@ -147,6 +155,15 @@
Name => 'WhereBlocked' &>
</td>
</tr>
+% } elsif ($Type eq 'Investigation') {
+ <tr>
+ <td class="labeltop"><&|/l&>Customer</&>:</td>
+ <td class="value">
+ <& /RTIR/Elements/EditRTIRField,
+ TicketObj => $Ticket,
+ Name => 'Customer' &>
+ </td>
+ </tr>
% }
<tr>
Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Investigation/Elements/Create
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Investigation/Elements/Create (original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Investigation/Elements/Create Thu Mar 9 00:09:36 2006
@@ -50,6 +50,15 @@
</td></tr>
% }
+% unless ( $SkipField{'Customer'} ) {
+<tr><td class="label"><&|/l&>Customer</&>:</td>
+<td class="value"><& /RTIR/Elements/EditRTIRField,
+ QueueObj => $QueueObj,
+ Name => 'Customer' &>
+</td></tr>
+% }
+
+
% if ( $QueueObj || $ARGS{'TicketObj'} ) {
% unless ( $SkipField{'CustomFields'} ) {
<tr><td colspan="2"><& /Ticket/Elements/EditCustomFields,
@@ -111,9 +120,8 @@
if ( !$QueueObj ) {
if ( my $queue = $value_cb->('Queue') ) {
- my $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
+ $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
$QueueObj->Load( $queue );
-# Abort( loc("Couldn't load queue '[_1]'.", $queue) );
}
}
</%INIT>
More information about the Rt-commit
mailing list