[Rt-commit] r8439 - in rtir/branches/2.3-EXPERIMENTAL/html/RTIR: Incident/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Tue Aug  7 23:30:07 2007
New Revision: 8439

Modified:
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html
   rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Elements/Create

Log:
* fix some new failing tests

Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Create.html	Tue Aug  7 23:30:07 2007
@@ -145,11 +145,14 @@
   <tr>
     <td class="labeltop"><&|/l&>Constituency</&>:</td>
     <td class="value" colspan="2">
-% unless ( $Incident ) {
+% if ( !$Incident || RT->Config->Get('_RTIR_Constituency_Propagation') eq 'no' ) {
+% my $default;
+% $default = $IncidentObj->FirstCustomFieldValue('_RTIR_Constituency') if $Incident;
+% $default ||= scalar RT->Config->Get('_RTIR_Constituency_default');
       <& /RTIR/Elements/EditRTIRField, 
          QueueObj => $QueueObj, 
          Name     => 'Constituency',
-         Default  => scalar RT->Config->Get('_RTIR_Constituency_default') &>
+         Default  => $default &>
 % } else {
 % #TODO: hacks, we need way to define CF value on Create, but don't allow user to change it
 %   my $cf = RT::CustomField->new( $RT::SystemUser );

Modified: rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Elements/Create
==============================================================================
--- rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Elements/Create	(original)
+++ rtir/branches/2.3-EXPERIMENTAL/html/RTIR/Incident/Elements/Create	Tue Aug  7 23:30:07 2007
@@ -39,11 +39,14 @@
 
 <tr><td class="label"><&|/l&>Constituency</&>:</td>
 <td class="value">
-% unless ( $ChildObj ) {
+% if ( !$ChildObj || RT->Config->Get('_RTIR_Constituency_Propagation') eq 'no' ) {
+% my $default;
+% $default = $ChildObj->FirstCustomFieldValue('_RTIR_Constituency') if $ChildObj;
+% $default ||= scalar RT->Config->Get('_RTIR_Constituency_default');
 <& /RTIR/Elements/EditRTIRField,
     QueueObj => $QueueObj,
     Name     => 'Constituency',
-    Default  => scalar RT->Config->Get('_RTIR_Constituency_default'),
+    Default  => $default,
     Rows     => 1,
 &>
 % } else {