[Rt-commit] rt branch, 4.2/add-scrips-menu, repushed

[Wallace Reis]

The branch 4.2/add-scrips-menu was deleted and repushed:
       was 019fa96b4bfb38b641d5cfdc04bcd78ecb25c6c6
       now e77a6f353bac4a67164d2bc29502ea5f533107af

1:  019fa96 ! 1:  e77a6f3 I#28787: Add Scrips menu
    @@ -21,6 +21,42 @@
              .q{,__Condition__, __Action__, __Template__, __Disabled__},
      
          Templates =>
    +
    +diff --git a/share/html/Admin/Scrips/Create.html b/share/html/Admin/Scrips/Create.html
    +--- a/share/html/Admin/Scrips/Create.html
    ++++ b/share/html/Admin/Scrips/Create.html
    +@@
    + 
    + <form method="post" action="Create.html" id="CreateScrip" name="CreateScrip">
    + <input type="hidden" class="hidden" name="Queue" value="<% $Queue %>" />
    ++<input type="hidden" class="hidden" name="Global" value="<% $Global %>" />
    + 
    + <&| /Widgets/TitleBox, title => loc('Basics') &>
    + <table>
    +@@
    + <%ARGS>
    + $Queue => 0
    + $Create => undef
    ++$Global => undef
    + </%ARGS>
    + <%INIT>
    + my @results;
    +@@
    +         Force     => 1,
    +         Actions   => [ $msg ],
    +         Path      => 'Admin/Scrips/Modify.html',
    +-        Arguments => { id => $scrip->id },
    ++        Arguments => {
    ++            id => $scrip->id,
    ++            $Queue ? (
    ++                From => $Queue,
    ++            ) : $Global ? (
    ++                From => 'Global',
    ++            ) : ()
    ++        },
    +     ) if $status;
    + 
    +     push @results, $msg;
     
     diff --git a/share/html/Admin/Scrips/Modify.html b/share/html/Admin/Scrips/Modify.html
     --- a/share/html/Admin/Scrips/Modify.html
    @@ -84,22 +120,33 @@
     --- a/share/html/Elements/Tabs
     +++ b/share/html/Elements/Tabs
     @@
    +         path        => '/Admin/Global/Scrips.html',
    +     );
    +     $scrips->child( select => title => loc('Select'), path => "/Admin/Global/Scrips.html" );
    +-    $scrips->child( create => title => loc('Create'), path => "/Admin/Scrips/Create.html" );
    ++    $scrips->child( create => title => loc('Create'), path => "/Admin/Scrips/Create.html?Global=1" );
    + 
    +     my $templates = $admin_global->child( templates =>
    +         title       => loc('Templates'),
    +@@
                  $obj->Load($id);
      
                  my $tabs = PageMenu();
     +
    -+            my ( $admin_cat, $create_path_arg ) = ( q{}, q{} );
    ++            my ( $admin_cat, $create_path_arg );
     +            my $from_arg = $DECODED_ARGS->{'From'} || q{};
    -+            my ($from_queue) =  $from_arg =~ /^(\d+)$/;
    ++            my ($from_queue) = $from_arg =~ /^(\d+)$/;
     +            if ( $from_queue ) {
     +                $admin_cat = "Queues/Scrips.html?id=$from_queue";
    -+                $create_path_arg = '?Queue=$from_queue';
    ++                $create_path_arg = "?Queue=$from_queue";
     +            }
     +            elsif ( $from_arg eq 'Global' ) {
     +                $admin_cat = 'Global/Scrips.html';
    ++                $create_path_arg = '?Global=1';
     +            }
     +            else {
     +                $admin_cat = 'Scrips';
    ++                $create_path_arg = q{};
     +            }
     +            my $scrips = $tabs->child( scrips => title => loc('Scrips'), path => "/Admin/${admin_cat}" );
     +            $scrips->child( select => title => loc('Select'), path => "/Admin/${admin_cat}" );
    @@ -108,3 +155,29 @@
                  $tabs->child( basics => title => loc('Basics') => path => "/Admin/Scrips/Modify.html?id=".$id );
                  $tabs->child( 'applies-to' => title => loc('Applies to'), path => "/Admin/Scrips/Objects.html?id=" . $id );
              }
    +@@
    +         }
    +         elsif ( $request_path =~ m{^/Admin/Scrips/Create\.html$} ) {
    +             my ($queue) = $DECODED_ARGS->{'Queue'} && $DECODED_ARGS->{'Queue'} =~ /^(\d+)$/;
    ++            my $global_arg = $DECODED_ARGS->{'Global'};
    +             if ($queue) {
    +                 PageMenu->child( select => title => loc('Select') => path => "/Admin/Queues/Scrips.html?id=$queue" );
    +                 PageMenu->child( create => title => loc('Create') => path => "/Admin/Scrips/Create.html?Queue=$queue" );
    +-            } else {
    ++            } elsif ($global_arg) {
    +                 PageMenu->child( select => title => loc('Select') => path => "/Admin/Global/Scrips.html" );
    ++                PageMenu->child( create => title => loc('Create') => path => "/Admin/Scrips/Create.html?Global=1" );
    ++            } else {
    ++                PageMenu->child( select => title => loc('Select') => path => "/Admin/Scrips" );
    +                 PageMenu->child( create => title => loc('Create') => path => "/Admin/Scrips/Create.html" );
    +             }
    +         }
    +@@
    +     if ( $request_path =~ m{^/Admin/Global/Scrips\.html} ) {
    +         my $tabs = PageMenu();
    +         $tabs->child( select => title => loc('Select'), path => "/Admin/Global/Scrips.html" );
    +-        $tabs->child( create => title => loc('Create'), path => "/Admin/Scrips/Create.html" );
    ++        $tabs->child( create => title => loc('Create'), path => "/Admin/Scrips/Create.html?Global=1" );
    +     }
    + 
    +     if ( $request_path =~ m{^/Admin/Global/Templates?\.html} ) {