projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
import rt 3.6.4
[freeside.git]
/
rt
/
html
/
Ticket
/
Elements
/
EditCustomFields
diff --git
a/rt/html/Ticket/Elements/EditCustomFields
b/rt/html/Ticket/Elements/EditCustomFields
index
6ae188f
..
5af48cb
100644
(file)
--- a/
rt/html/Ticket/Elements/EditCustomFields
+++ b/
rt/html/Ticket/Elements/EditCustomFields
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-200
5
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-200
7
Best Practical Solutions, LLC
%# <jesse@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <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
%#
%# 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:
%#
%#
%# CONTRIBUTION SUBMISSION POLICY:
@@
-48,8
+50,7
@@
<td valign="top" width="50%">
<table>
<td valign="top" width="50%">
<table>
-% my @entry_fields;
-% my $i;
+% 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
% 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
@@
-61,16
+62,21
@@
<table>
% }
% $i++;
<table>
% }
% $i++;
- <tr>
+ <tr
id="CF-<%$CustomField->id%>-EditRow"
>
<td class="labeltop">
<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,
<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>
</tr>
% }
</table>