[Rt-commit] r4966 - in rtir/branches/1.9-EXPERIMENTAL: html/RTIR html/RTIR/Incident/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Tue Apr  4 14:41:34 2006
New Revision: 4966

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

Log:
 r1235 at cubic-pc:  cubic | 2006-04-04 18:34:52 +0400
 * minor cleanup


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	Tue Apr  4 14:41:34 2006
@@ -60,11 +60,11 @@
 <form action="<% RT->Config->Get('WebPath') %>/RTIR/Split.html" method="post" enctype="multipart/form-data">
 % }
 <input type="hidden" name="id" value="new" />
-<input type="hidden" name="Queue" value="<% $QueueObj->Name %>" />
-<input type="hidden" name="Status" value="<% $Status || 'open' %>" />
-<input type="hidden" name="Incident" value="<% $ARGS{Incident} %>" />
+<input type="hidden" name="Queue" value="<% $Queue %>" />
+<input type="hidden" name="Status" value="<% $Status || 'new' %>" />
+<input type="hidden" name="Incident" value="<% $Incident || '' %>" />
 % if ( $Split ) {
-<input type="hidden" name="Ticket" value="<% $ARGS{'TicketObj'}->Id %>" />
+<input type="hidden" name="Ticket" value="<% $TicketObj->Id %>" />
 % }
 <%PERL>
 my $parentvalue;
@@ -129,9 +129,9 @@
     <td colspan="2">
       <table>
       <tr>
-        <td><input size="3" name="TimeWorked"<% $ARGS{TimeWorked} && " value=\"$ARGS{TimeWorked}\""  %> /></td>
+        <td><input size="3" name="TimeWorked" value="<% $ARGS{'TimeWorked'} || '' %>" /></td>
         <td align="right"><&|/l&>Time Left</&>:</td>
-        <td><input size="3" name="TimeLeft"<% $ARGS{TimeLeft} && " value=\"$ARGS{TimeLeft}\"" %> /></td>
+        <td><input size="3" name="TimeLeft" value="<% $ARGS{'TimeLeft'} || '' %>" /></td>
       </tr>
       </table>
     </td>     
@@ -141,7 +141,7 @@
       <&|/l&>Correspondents</&>:
     </td>
     <td colspan="5">
-      <input name="Requestors" value="<%$ARGS{Requestors}%>" size="40" />
+      <input name="Requestors" value="<% $ARGS{'Requestors'} || '' %>" size="40" />
     </td>
   </tr>
   <tr>
@@ -149,7 +149,7 @@
       <&|/l&>Cc</&>:
     </td>
     <td class="value" colspan="5">
-      <input name="Cc" value="<%($ARGS{Cc})%>" size="40" />
+      <input name="Cc" value="<% $ARGS{'Cc'} || '' %>" size="40" />
       <i><font size="-2">
       <&|/l&>(Sends a carbon-copy of this update to a comma-delimited list of email addresses. These people <b>will</b> receive future updates.)</&></font></i>
     </td>
@@ -159,20 +159,20 @@
       <&|/l&>Admin Cc</&>:
     </td>
     <td class="value" colspan="5">
-      <input name="AdminCc" value="<%($ARGS{AdminCc}) || ""%>" size="40" />
+      <input name="AdminCc" value="<% $ARGS{'AdminCc'} || '' %>" size="40" />
       <i><font size="-2">
       <&|/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>
 
-% if ($QueueObj->Name eq 'Incident Reports') {
+% if ( $Type eq 'Report' ) {
   <tr>
     <td class="labeltop"><&|/l&>SLA</&>:</td>
     <td class="value">
       <& /RTIR/Elements/EditRTIRField, 
          QueueObj => $QueueObj, 
          Name => 'SLA',
-         Default => $sla &>
+         Default => RT::IR::DefaultSLA() &>
     </td>
   </tr>
   <tr>
@@ -402,11 +402,6 @@
     }
 }
 
-my $sla;
-if ($Queue eq 'Incident Reports') {
-    $sla = RT::IR::DefaultSLA();
-}
-
 </%INIT>
 
 <%ARGS>

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Elements/Create
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Elements/Create	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Incident/Elements/Create	Tue Apr  4 14:41:34 2006
@@ -25,7 +25,7 @@
 
 <tr><td class="label"><&|/l&>Subject</&>:</td>
 <td class="value">
-<input name="Subject" size="60" maxsize="100" value="<% $ARGS{'Subject'} %>" />
+<input name="Subject" size="60" maxsize="100" value="<% $Subject %>" />
 </td></tr>
 
 <tr><td class="labeltop"><&|/l&>Description</&>:</td>
@@ -74,6 +74,7 @@
 
 <%ARGS>
 $NamePrefix => ''
-$QueueObj => undef
-$TicketObj => undef
+$QueueObj   => undef
+$TicketObj  => undef
+$Subject    => ''
 </%ARGS>