[Rt-commit] rtir branch, 2.5-greenville, updated. 2289d379b0a4636168488281f58a217a44626e45

[Kevin Falcone]

The branch, 2.5-greenville has been updated
       via  2289d379b0a4636168488281f58a217a44626e45 (commit)
      from  e9e7038730ac5c772a737b6570c17a4c5c64e40d (commit)

Summary of changes:
 html/RTIR/Incident/Edit.html |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 2289d379b0a4636168488281f58a217a44626e45
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Sat Oct 17 18:24:31 2009 -0400

    Don't display a disabled Constituency during Incident editing

diff --git a/html/RTIR/Incident/Edit.html b/html/RTIR/Incident/Edit.html
index 4ad10d9..5c9dab8 100644
--- a/html/RTIR/Incident/Edit.html
+++ b/html/RTIR/Incident/Edit.html
@@ -69,7 +69,7 @@
     <td class="label"><&|/l&>Time Worked</&>:</td>
     <td class="value"><input name="TimeWorked" value="<%$Ticket->TimeWorked|h%>" size="5" /></td>
   </tr>
-% if ( $constituency_propagation ne 'reject' || !$has_children ) {
+% if ( $constituency_cf && ( $constituency_propagation ne 'reject' || !$has_children )) {
   <tr>
     <td class="label"><&|/l&>Constituency</&>:</td>
     <td class="value">
@@ -126,9 +126,10 @@ $CanRespond = 1 if ( $Ticket->CurrentUserHasRight('ReplyToTicket') or
 $CanComment = 1 if ( $Ticket->CurrentUserHasRight('CommentOnTicket') or
                      $Ticket->CurrentUserHasRight('ModifyTicket') );
 
+my $constituency_cf = RT::IR->CustomFields( Constituency => Ticket => $Ticket );
 my $constituency_propagation = RT->Config->Get('_RTIR_Constituency_Propagation');
 my $has_children = 0;
-if ( $constituency_propagation eq 'reject' ) {
+if ( $constituency_cf && $constituency_propagation eq 'reject' ) {
     my $query = "( Queue = 'Incident Reports' OR Queue = 'Investigations' OR Queue = 'Blocks' )"
         ." AND MemberOf = ". $Ticket->id;
     my $tickets = RT::Tickets->new( $RT::SystemUser );

-----------------------------------------------------------------------