[Rt-commit] rtir branch, 5.0/search-selection, repushed

[Craig Kaiser]

The branch 5.0/search-selection was deleted and repushed:
       was 69c13c0efb60db81240ebf742be1159354fcf7a5
       now cddeff2a674ac640da4bed60787e5ad2d01c7be9

1: 4f976bfd ! 1: f1ed0058 Use new search selection interface for editing RTIR home page
    @@ -15,6 +15,8 @@
     -    bodyclass => ""
     -&>
     -<& /Widgets/SelectionBox:show, self => $pane &>
    +-</&>
    +-% }
     +<form method="post" name="UpdateSearches" class="mx-auto max-width-lg">
     +  <& /Widgets/SearchSelection,
     +    pane_name => \%pane_name,
    @@ -25,28 +27,10 @@
     +  <input type="hidden" name="dashboard_id" value="MyRT">
     +  <& /Elements/Submit, Name => "UpdateSearches", Label => loc('Save') &>
     +</form>
    -+
    -+<&|/Widgets/TitleBox, title => loc('Options'), bodyclass => "", class => "mx-auto max-width-lg" &>
    -+<form method="post" action="MyRT.html">
    -+  <div class="form-row">
    -+    <div class="label col-auto">
    -+      <&|/l&>Rows per box</&>:
    -+    </div>
    -+    <div class="col-auto">
    -+      <input class="form-control" type="text" name="SummaryRows" value="<% $ARGS{SummaryRows} %>" />
    -+    </div>
    -+    <div class="col-auto">
    -+      <input type="submit" class="button form-control btn btn-primary" name="UpdateSummaryRows" value="<% loc('Save') %>" />
    -+    </div>
    -+  </div>
    -+</form>
    - </&>
    --% }
    - 
    --<%INIT>
    + 
    + <%INIT>
     -# XXX: copy&past of the similar RT's page
    - 
    -+<%INIT>
    +-
      my @results;
     +my $title = loc("Customize").' '.loc("RT at a glance");
      my $user = $session{'CurrentUser'}->UserObj;
    @@ -54,13 +38,7 @@
     -unless (exists $session{'my_rtir_portlets'}) {
     -    my ($d_portlets) = RT::System->new($session{'CurrentUser'})->Attributes->Named('RTIR_HomepageSettings');
     -    $session{'my_rtir_portlets'} = $user->Preferences('RTIR_HomepageSettings', $d_portlets->Content);
    -+if ($ARGS{Reset}) {
    -+    next unless $user->Preferences('RTIR_HomepageSettings');
    -+    my ($ok, $msg) = $user->DeletePreferences('RTIR_HomepageSettings');
    -+    push @results, $msg unless $ok;
    -+
    -+    push @results, loc('Preferences saved.') unless @results;
    - }
    +-}
     -my $portlets = $session{'my_rtir_portlets'};
     -
     -my %seen;
    @@ -75,7 +53,6 @@
     -        $desc =~ s/^.*\///;
     -    }
     -    push @items, ["component-$comp", $desc];
    -+
     +my $portlets = $user->Preferences('RTIR_HomepageSettings');
     +unless ($portlets) {
     +    my ($defaults) = RT::System->new($session{'CurrentUser'})->Attributes->Named('RTIR_HomepageSettings');
    @@ -182,15 +159,16 @@
     +my %pane_name = (
     +    'body'    => loc('Body'),
     +    'sidebar' => loc('Sidebar'),
    -+);
    -+
    + );
    + 
    +-$m->comp ('/Widgets/SelectionBox:process', %ARGS, self => $_ ) for @panes;
     +my @filters = (
     +    [ 'component' => loc('Components') ],
     +    [ 'ticket'    => loc('Tickets') ],
     +    [ 'chart'     => loc('Charts') ],
    - );
    - 
    --$m->comp ('/Widgets/SelectionBox:process', %ARGS, self => $_ ) for @panes;
    ++);
    + 
    +-MaybeRedirectForResults( Actions => \@results );
     +$m->callback(
     +    CallbackName => 'Default',
     +    pane_name    => \%pane_name,
    @@ -226,8 +204,7 @@
     +
     +    my ( $ok, $msg );
     +    my $user = $session{CurrentUser};
    - 
    --MaybeRedirectForResults( Actions => \@results );
    ++
     +    if ( my $user_id = $ARGS{user_id} ) {
     +        my $UserObj = RT::User->new( $session{'CurrentUser'} );
     +        ( $ok, $msg ) = $UserObj->Load($user_id);
2: 69c13c0e = 2: cddeff2a Add tests for new search selection UI for RTIR homepage