projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-19' of https://github.com/gjones2/Freeside
[freeside.git]
/
rt
/
share
/
html
/
Admin
/
CustomFields
/
Modify.html
diff --git
a/rt/share/html/Admin/CustomFields/Modify.html
b/rt/share/html/Admin/CustomFields/Modify.html
index
4ed86b6
..
358dcfd
100644
(file)
--- a/
rt/share/html/Admin/CustomFields/Modify.html
+++ b/
rt/share/html/Admin/CustomFields/Modify.html
@@
-144,6
+144,11
@@
</td></tr>
<tr><td class="label"> </td><td>
</td></tr>
<tr><td class="label"> </td><td>
+<input type="checkbox" class="checkbox" name="YesClone" value="1" <% $YesCloneChecked |n%> />
+<&|/l&>Copy this field to new tickets</&>
+</td></tr>
+
+<tr><td class="label"> </td><td>
<input type="hidden" class="hidden" name="SetEnabled" value="1" />
<input type="checkbox" class="checkbox" name="Enabled" value="1" <% $EnabledChecked |n%> />
<&|/l&>Enabled (Unchecking this box disables this custom field)</&>
<input type="hidden" class="hidden" name="SetEnabled" value="1" />
<input type="checkbox" class="checkbox" name="Enabled" value="1" <% $EnabledChecked |n%> />
<&|/l&>Enabled (Unchecking this box disables this custom field)</&>
@@
-187,6
+192,7
@@
else {
IncludeContentForValue => $IncludeContentForValue,
BasedOn => $BasedOn,
Disabled => !$Enabled,
IncludeContentForValue => $IncludeContentForValue,
BasedOn => $BasedOn,
Disabled => !$Enabled,
+ NoClone => !$YesClone,
);
if (!$val) {
push @results, loc("Could not create CustomField: [_1]", $msg);
);
if (!$val) {
push @results, loc("Could not create CustomField: [_1]", $msg);
@@
-207,10
+213,12
@@
else {
if ( $ARGS{'Update'} && $id ne 'new' ) {
#we're asking about enabled on the web page but really care about disabled.
$ARGS{'Disabled'} = $Enabled? 0 : 1;
if ( $ARGS{'Update'} && $id ne 'new' ) {
#we're asking about enabled on the web page but really care about disabled.
$ARGS{'Disabled'} = $Enabled? 0 : 1;
+ # likewise
+ $ARGS{'NoClone'} = $YesClone ? 0 : 1;
$ARGS{'Required'} ||= 0;
$ARGS{'Required'} ||= 0;
- my @attribs = qw(Disabled Required Pattern Name TypeComposite LookupType Description LinkValueTo IncludeContentForValue);
+ my @attribs = qw(Disabled Required Pattern Name TypeComposite LookupType Description LinkValueTo IncludeContentForValue
NoClone
);
push @results, UpdateRecordObject(
AttributesRef => \@attribs,
Object => $CustomFieldObj,
push @results, UpdateRecordObject(
AttributesRef => \@attribs,
Object => $CustomFieldObj,
@@
-313,6
+321,10
@@
$EnabledChecked = '' if $CustomFieldObj->Disabled;
my $RequiredChecked = '';
$RequiredChecked = qq[checked="checked"] if $CustomFieldObj->Required;
my $RequiredChecked = '';
$RequiredChecked = qq[checked="checked"] if $CustomFieldObj->Required;
+my $YesCloneChecked = qq[checked="checked"];
+$YesCloneChecked = '' if $CustomFieldObj->NoClone;
+
+
my @CFvalidations = (
'(?#Mandatory).',
'(?#Digits)^[\d.]+$',
my @CFvalidations = (
'(?#Mandatory).',
'(?#Digits)^[\d.]+$',
@@
-339,4
+351,5
@@
$LinkValueTo => undef
$IncludeContentForValue => undef
$BasedOn => undef
$UILocation => undef
$IncludeContentForValue => undef
$BasedOn => undef
$UILocation => undef
+$YesClone => undef
</%ARGS>
</%ARGS>