diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-06-04 00:21:24 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-06-04 00:21:24 -0700 |
| commit | 679854b8bbc65d112071111bbd7f34a6a481fb30 (patch) | |
| tree | dda0862fdf7853f4f61e4cf155c8bbc93768c994 /rt/share/html/Admin/CustomFields | |
| parent | 9b328d940af56b9924a342192ebb0790478fa705 (diff) | |
RT 4.0.13
Diffstat (limited to 'rt/share/html/Admin/CustomFields')
| -rw-r--r-- | rt/share/html/Admin/CustomFields/GroupRights.html | 2 | ||||
| -rw-r--r-- | rt/share/html/Admin/CustomFields/Modify.html | 14 | ||||
| -rw-r--r-- | rt/share/html/Admin/CustomFields/Objects.html | 2 | ||||
| -rw-r--r-- | rt/share/html/Admin/CustomFields/UserRights.html | 2 | ||||
| -rw-r--r-- | rt/share/html/Admin/CustomFields/index.html | 2 |
5 files changed, 15 insertions, 7 deletions
diff --git a/rt/share/html/Admin/CustomFields/GroupRights.html b/rt/share/html/Admin/CustomFields/GroupRights.html index 31c09afc0..e58268fa4 100644 --- a/rt/share/html/Admin/CustomFields/GroupRights.html +++ b/rt/share/html/Admin/CustomFields/GroupRights.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/Admin/CustomFields/Modify.html b/rt/share/html/Admin/CustomFields/Modify.html index 358dcfd70..8628cd383 100644 --- a/rt/share/html/Admin/CustomFields/Modify.html +++ b/rt/share/html/Admin/CustomFields/Modify.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) @@ -224,7 +224,15 @@ if ( $ARGS{'Update'} && $id ne 'new' ) { Object => $CustomFieldObj, ARGSRef => \%ARGS ); - $CustomFieldObj->SetValuesClass( $ValuesClass ); + if ( ($ValuesClass||'RT::CustomFieldValues') ne $CustomFieldObj->ValuesClass ) { + my $original = $CustomFieldObj->ValuesClass; + my ($good, $msg) = $CustomFieldObj->SetValuesClass( $ValuesClass ); + if ( $good ) { + $msg = loc("[_1] changed from '[_2]' to '[_3]'", + loc("Field values source"), $original, $ValuesClass ); + } + push @results, $msg; + } # Set the render type if we have it, but unset it if the new type doesn't # support render types @@ -258,7 +266,7 @@ if ( $ARGS{'Update'} && $id ne 'new' ) { my $paramtag = "CustomField-". $CustomFieldObj->Id ."-Value"; # Delete any fields that want to be deleted foreach my $key ( keys %ARGS ) { - next unless $key =~ /^Delete-$paramtag-(\d+)$/o; + next unless $key =~ /^Delete-$paramtag-(\d+)$/; my ($val, $msg) = $CustomFieldObj->DeleteValue( $1 ); push (@results, $msg); } diff --git a/rt/share/html/Admin/CustomFields/Objects.html b/rt/share/html/Admin/CustomFields/Objects.html index 91dc5dcfb..26183acc1 100644 --- a/rt/share/html/Admin/CustomFields/Objects.html +++ b/rt/share/html/Admin/CustomFields/Objects.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/Admin/CustomFields/UserRights.html b/rt/share/html/Admin/CustomFields/UserRights.html index 608d5dc40..d4692986c 100644 --- a/rt/share/html/Admin/CustomFields/UserRights.html +++ b/rt/share/html/Admin/CustomFields/UserRights.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) diff --git a/rt/share/html/Admin/CustomFields/index.html b/rt/share/html/Admin/CustomFields/index.html index b8bc447d2..24264fd23 100644 --- a/rt/share/html/Admin/CustomFields/index.html +++ b/rt/share/html/Admin/CustomFields/index.html @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2012 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC %# <sales@bestpractical.com> %# %# (Except where explicitly superseded by other copyright notices) |