[Rt-commit] r5996 - in rtir/branches/2.1-EXPERIMENTAL: . html/RTIR html/RTIR/Incident/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Tue Sep 19 15:47:34 2006
New Revision: 5996

Modified:
   rtir/branches/2.1-EXPERIMENTAL/   (props changed)
   rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Create.html
   rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Create.html
   rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Elements/Create

Log:
 r1584 at cubic-pc:  cubic | 2006-09-19 20:15:18 +0400
 Constituency
 * add constituency editor to Create.html
 * preset default value on linking from another end of the link


Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Create.html	(original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Create.html	Tue Sep 19 15:47:34 2006
@@ -141,6 +141,17 @@
         <&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of administrative email addresses. These people <b>will</b> receive future updates.)</&>
     </font></i></td>
   </tr>
+  <tr>
+    <td class="labeltop"><&|/l&>Constituency</&>:</td>
+    <td class="value" colspan="2">
+      <& /RTIR/Elements/EditRTIRField, 
+         QueueObj => $QueueObj, 
+         Name     => 'Constituency',
+         Default  => $Incident?
+            $Incident->FirstCustomFieldValue('_RTIR_Constituency'):
+            scalar RT->Config->Get('_RTIR_Constituency_default') &>
+    </td>
+  </tr>
 
 % if ( $Type eq 'Report' ) {
   <tr>

Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Create.html
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Create.html	(original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Create.html	Tue Sep 19 15:47:34 2006
@@ -92,7 +92,7 @@
 % }
 </tr>
 
-<& Elements/Create, Title => $Title, TicketObj => $TicketObj, QueueObj => $QueueObj, %ARGS &>
+<& Elements/Create, Title => $Title, TicketObj => $TicketObj, QueueObj => $QueueObj, ChildObj => $ChildObj, %ARGS &>
 
 <tr><td class="labeltop"><&|/l&>Message</&>:</td>
 <td>

Modified: rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Elements/Create
==============================================================================
--- rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Elements/Create	(original)
+++ rtir/branches/2.1-EXPERIMENTAL/html/RTIR/Incident/Elements/Create	Tue Sep 19 15:47:34 2006
@@ -32,27 +32,29 @@
 <td class="value">
 <& /RTIR/Elements/EditRTIRField,
     QueueObj => $QueueObj,
-	Name     => 'Description',
-	Default  => scalar RT->Config->Get('_RTIR_Description_default'),
-	Cols     => 40,
+    Name     => 'Description',
+    Default  => scalar RT->Config->Get('_RTIR_Description_default'),
+    Cols     => 40,
 &></td></tr>
 
 <tr><td class="label"><&|/l&>Constituency</&>:</td>
 <td class="value">
 <& /RTIR/Elements/EditRTIRField,
     QueueObj => $QueueObj,
-	Name     => 'Constituency',
-	Default  => scalar RT->Config->Get('_RTIR_Constituency_default'),
-	Rows     => 1,
+    Name     => 'Constituency',
+    Default  => $ChildObj?
+        $ChildObj->FirstCustomFieldValue('_RTIR_Constituency'):
+        scalar RT->Config->Get('_RTIR_Constituency_default'),
+    Rows     => 1,
 &></td></tr>
 
 <tr><td class="label"><&|/l&>Function</&>:</td>
 <td class="value">
 <& /RTIR/Elements/EditRTIRField, 
     QueueObj => $QueueObj, 
-	Name     => 'Function',
-	Default  => scalar RT->Config->Get('_RTIR_Function_default'),
-	Rows     => 1,
+    Name     => 'Function',
+    Default  => scalar RT->Config->Get('_RTIR_Function_default'),
+    Rows     => 1,
 &></td></tr>
 
 <tr><td class="label"><&|/l&>Classification</&>:</td>
@@ -92,5 +94,6 @@
 $NamePrefix => ''
 $QueueObj   => undef
 $TicketObj  => undef
+$ChildObj   => undef
 $Subject    => ''
 </%ARGS>