diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
| commit | 026dc7ad72ba972f230b6709e31fa64397d75ad4 (patch) | |
| tree | c5af1a7ac9154744afc3660e9a9405892f2bb50b /rt/lib/RT/Action/CreateTickets.pm.orig | |
| parent | 07b4bc84d1078f7390221d766cdb3142513db4b0 (diff) | |
| parent | 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 (diff) | |
merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
Diffstat (limited to 'rt/lib/RT/Action/CreateTickets.pm.orig')
| -rw-r--r-- | rt/lib/RT/Action/CreateTickets.pm.orig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/rt/lib/RT/Action/CreateTickets.pm.orig b/rt/lib/RT/Action/CreateTickets.pm.orig index 542cbd27b..46791de58 100644 --- a/rt/lib/RT/Action/CreateTickets.pm.orig +++ b/rt/lib/RT/Action/CreateTickets.pm.orig @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -960,6 +960,13 @@ sub GetDeferred { my $links = shift; my $postponed = shift; + # Unify the aliases for child/parent + $args->{$_} = [$args->{$_}] + for grep {$args->{$_} and not ref $args->{$_}} qw/members hasmember memberof/; + push @{$args->{'children'}}, @{delete $args->{'members'}} if $args->{'members'}; + push @{$args->{'children'}}, @{delete $args->{'hasmember'}} if $args->{'hasmember'}; + push @{$args->{'parents'}}, @{delete $args->{'memberof'}} if $args->{'memberof'}; + # Deferred processing push @$links, ( |