[Rt-commit] rtir branch, 2.5-trunk, updated. 7e0e1fa9036cabb4015daaa4c5118d982bee0241

[Kevin Falcone]

The branch, 2.5-trunk has been updated
       via  7e0e1fa9036cabb4015daaa4c5118d982bee0241 (commit)
      from  32a3b2ce616e455ec3e2f61fc198c4d381ffdd80 (commit)

Summary of changes:
 html/RTIR/Incident/Elements/Create |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 7e0e1fa9036cabb4015daaa4c5118d982bee0241
Author: Kevin Falcone <falcone at bestpractical.com>
Date:   Thu Sep 17 11:42:50 2009 -0400

    Hide Constituency on Incident creation if it is disabled

diff --git a/html/RTIR/Incident/Elements/Create b/html/RTIR/Incident/Elements/Create
index c17eb8f..d9d1724 100644
--- a/html/RTIR/Incident/Elements/Create
+++ b/html/RTIR/Incident/Elements/Create
@@ -28,6 +28,7 @@
 <input name="Subject" size="60" maxsize="100" value="<% $Subject %>" />
 </td></tr>
 
+% if ($constituency_cf) {
 <tr><td class="label"><&|/l&>Constituency</&>:</td>
 <td class="value">
 % if ( !$ChildObj || RT->Config->Get('_RTIR_Constituency_Propagation') eq 'no' ) {
@@ -43,14 +44,13 @@
 &>
 % } 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 );
-% $cf->LoadByNameAndQueue( Name => 'Constituency', Queue => 'Incidents' );
-<input type="hidden" class="hidden" name="Constituency" value="Object-RT::Ticket--CustomField-<% $cf->id %>-Values" />
-<input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $cf->id %>-Values-Magic" value="1" />
-<input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $cf->id %>-Values" value="<% $ChildObj->FirstCustomFieldValue('Constituency') %>" />
+<input type="hidden" class="hidden" name="Constituency" value="Object-RT::Ticket--CustomField-<% $constituency_cf->id %>-Values" />
+<input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $constituency_cf->id %>-Values-Magic" value="1" />
+<input type="hidden" class="hidden" name="Object-RT::Ticket--CustomField-<% $constituency_cf->id %>-Values" value="<% $ChildObj->FirstCustomFieldValue('Constituency') %>" />
 <& /RTIR/Elements/ShowRTIRField, Ticket => $ChildObj, Name => 'Constituency' &>
 % }
 </td></tr>
+% }
 
 <tr><td colspan="2">
 <& /RTIR/Elements/EditCustomFields,
@@ -62,6 +62,9 @@
 
 <tr><td colspan="2"><& /RTIR/Create.html:AttachmentsForm &></td></tr>
 
+<%INIT>
+my $constituency_cf = RT::IR->CustomFields( 'Constituency', Queue => $QueueObj->Name );
+</%INIT>
 <%ARGS>
 $NamePrefix => ''
 $QueueObj   => undef

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