[Rt-commit] rt branch, 4.2-trunk, updated. rt-4.2.12-97-g6c46b1d

[Shawn Moore]

The branch, 4.2-trunk has been updated
       via  6c46b1d0b09aa91bc56d55f5b6c690163463ecaf (commit)
       via  a88e47e12a1803c4f8308780f3683a1dc7310ddd (commit)
      from  4028723fee8d7a6b0e21694492d260942e662f69 (commit)

Summary of changes:
 share/html/Admin/CustomFields/Modify.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit a88e47e12a1803c4f8308780f3683a1dc7310ddd
Author: Dustin Graves <dustin at bestpractical.com>
Date:   Wed Jan 6 00:38:55 2016 +0000

    add and modify callbacks to CustomFields Modify.html

diff --git a/share/html/Admin/CustomFields/Modify.html b/share/html/Admin/CustomFields/Modify.html
index dab2843..904d3e4 100644
--- a/share/html/Admin/CustomFields/Modify.html
+++ b/share/html/Admin/CustomFields/Modify.html
@@ -156,12 +156,13 @@
 <& /Elements/Submit, Name => 'Update', Label => $id eq 'new'? loc('Create'): loc('Save Changes') &>
 
 </form>
+% $m->callback(%ARGS, CallbackName => 'EndOfPage', CustomFieldObj => $CustomFieldObj);
 <%INIT>
 my ($title, @results, $added_cfv);
 
 my $CustomFieldObj = RT::CustomField->new( $session{'CurrentUser'} );
 
-$m->callback(CallbackName => 'Initial', Pattern => \$Pattern, ARGSRef => \%ARGS);
+$m->callback(CallbackName => 'Initial', Pattern => \$Pattern, Results => \@results, ARGSRef => \%ARGS);
 
 unless ( $id ) {
     $title = loc("Create a CustomField");

commit 6c46b1d0b09aa91bc56d55f5b6c690163463ecaf
Merge: 4028723 a88e47e
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Wed Jan 6 12:30:34 2016 -0500

    Merge branch '4.2/custom-field-values-csv' into 4.2-trunk


-----------------------------------------------------------------------