From 8103c1fc1b2c27a6855feadf26f91b980a54bc52 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Sun, 2 Mar 2008 04:11:51 +0000
Subject: import rt 3.6.6

---
 rt/html/Ticket/Elements/EditCustomFields | 54 +++++++++++++++++++-------------
 1 file changed, 32 insertions(+), 22 deletions(-)

(limited to 'rt/html/Ticket/Elements/EditCustomFields')

diff --git a/rt/html/Ticket/Elements/EditCustomFields b/rt/html/Ticket/Elements/EditCustomFields
index 78da71201..04d7180af 100644
--- a/rt/html/Ticket/Elements/EditCustomFields
+++ b/rt/html/Ticket/Elements/EditCustomFields
@@ -2,7 +2,7 @@
 %# 
 %# COPYRIGHT:
 %#  
-%# This software is Copyright (c) 1996-2005 Best Practical Solutions, LLC 
+%# This software is Copyright (c) 1996-2007 Best Practical Solutions, LLC 
 %#                                          <jesse@bestpractical.com>
 %# 
 %# (Except where explicitly superseded by other copyright notices)
@@ -22,7 +22,9 @@
 %# 
 %# You should have received a copy of the GNU General Public License
 %# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/copyleft/gpl.html.
 %# 
 %# 
 %# CONTRIBUTION SUBMISSION POLICY:
@@ -44,39 +46,47 @@
 %# 
 %# END BPS TAGGED BLOCK }}}
 <table>
-<tr>
-<td valign="top" width="50%">
-<table>
-
 % my $i = 0;
-% my $cfcount = $CustomFields->Count;
-%  $cfcount++ if ($cfcount % 2) ; # if we have an odd number of 
-% #custom fields, fudge it so we know where to put in the table break
-% while (my $CustomField = $CustomFields->Next()) {
-% if ($cfcount == 2 * $i) {
-</table>
-</td>
-<td valign="top" width="50%">
-<table>
-% }
+% while ( my $CustomField = $CustomFields->Next ) {
+% next unless $CustomField->CurrentUserHasRight('ModifyCustomField');
 % $i++;
-  <tr>
+% if ( $i % 2 ) {
+<tr>
+% }
+<td width="50%">
+<table>
+  <tr id="CF-<%$CustomField->id%>-EditRow">
     <td class="labeltop">
-      <b><%$CustomField->Name%></b><br>
+      <b><%$CustomField->Name%></b><br />
       <i><%$CustomField->FriendlyType%></i>
     </td>
     <td class="entry"><& /Elements/EditCustomField, 
         Object => $TicketObj, 
         CustomField => $CustomField, 
-        NamePrefix => $NamePrefix 
-        &></td>
+        NamePrefix => $NamePrefix ,
+        Default => $m->notes('Field-' . $CustomField->Id),
+        &>
+%  if (my $msg = $m->notes('InvalidField-' . $CustomField->Id)) {
+        <br />
+        <em style="color: red"><% $msg %></em>
+%  }
+    </td>
   </tr>
-% }
 </table>
 </td>
+
+% unless ( $i % 2 ) {
 </tr>
-</table>
+% }
+
+% }
 
+%# close row if required
+% if ( $i % 2 ) {
+</tr>
+% }
+
+</table>
 <%INIT>
 my $CustomFields;
 my $NamePrefix;
-- 
cgit v1.2.1