[Rt-commit] rtir branch, 5.0/allow-inline-edit-on-ticket-display, repushed

[Craig Kaiser]

The branch 5.0/allow-inline-edit-on-ticket-display was deleted and repushed:
       was f3dd22c684d20bb2616dd6f178945fd70dd2d915
       now 3b8dfe7df47edabdcf50afba3b54acf09daa64df

1: 2fbb548c ! 1: c6e8e4b5 Add inline edit to RTIR Display.html page
    @@ -10,7 +10,7 @@
      % $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'LeftColumnStart' );
      
     +<%PERL>
    -+    my $modify_url = RT->Config->Get('WebPath')."/RTIR/Edit.html?id=".$Ticket->Id;
    ++    my $modify_url = RT::IR->HREFTo("Edit.html?id=".$Ticket->Id);
     +    my $modify_inline
     +        = '<a class="inline-edit-toggle edit" href="%s">'
     +        . qq{<span class="fas fa-pencil-alt icon-bordered fa-2x" alt="$edit_label" data-toggle="tooltip" data-placement="top" data-original-title="$edit_label"></span>}
    @@ -19,7 +19,7 @@
     +        . qq{<span class="fas fa-times icon-bordered fa-2x" alt="$cancel_label" data-toggle="tooltip" data-placement="top" data-original-title="$cancel_label"></span>}
     +        . '</a>';
     +    my $modify_basics = sprintf( $modify_inline, $m->interp->apply_escapes( $modify_url, 'h' ) );
    -+    my $modify_behavior = $inline_edit_behavior{Basics} || $inline_edit_behavior{_default} || 'link';
    ++    my $modify_behavior = $InlineEdit ? ($inline_edit_behavior{Basics} || $inline_edit_behavior{_default} || 'link') : 'hide';
     +</%PERL>
     +
      <&| /Widgets/TitleBox,
    @@ -236,8 +236,8 @@
      % $m->callback( %ARGS, Ticket => $Ticket, CallbackName => 'RightColumnStart' );
      
     +<%PERL>
    -+  my $people_url = RT->Config->Get('WebPath')."/Ticket/Edit.html?id=".$Ticket->Id;
    -+  my $people_inline = sprintf( $modify_inline, $m->interp->apply_escapes( $people_url, 'h' ) );
    ++  my $people_url      = RT::IR->HREFTo("Edit.html?id=".$Ticket->Id);
    ++  my $people_inline   = sprintf( $modify_inline, $m->interp->apply_escapes( $people_url, 'h' ) );
     +  my $people_behavior = $InlineEdit ? ($inline_edit_behavior{People} || $inline_edit_behavior{_default} || 'link') : 'hide';
     +</%PERL>
     +
    @@ -246,7 +246,7 @@
     -        title_href  => RT::IR->HREFTo("Edit.html?id=". $Ticket->Id),
     -        class => 'ticket-info-people',
     +        title      => loc('People'),
    -+        title_href => RT::IR->HREFTo("Edit.html?id=". $Ticket->Id),
    ++        title_href => RT::IR->HREFTo("Edit.html?id=".$Ticket->Id),
     +        class      => (join " ", 'ticket-info-people', ($people_behavior eq 'always' ? 'editing' : ())),
     +        data       => { 'inline-edit-behavior' => $people_behavior },
     +        (($can_modify || $can_modify_people) && $people_behavior =~ /^(link|click)$/ ? (titleright_raw => $people_inline) : ()),
    @@ -274,7 +274,7 @@
     -        class => 'ticket-info-dates',
     +
     +<%PERL>
    -+    my $dates_url      = RT->Config->Get('WebPath')."/Ticket/Edit.html?id=".$Ticket->Id;
    ++    my $dates_url      = RT::IR->HREFTo("Edit.html?id=".$Ticket->Id);
     +    my $dates_inline   = sprintf( $modify_inline, $m->interp->apply_escapes( $dates_url, 'h' ) );
     +    my $dates_behavior = $InlineEdit ? ($inline_edit_behavior{Dates} || $inline_edit_behavior{_default} || 'link') : 'hide';
     +</%PERL>
    @@ -335,6 +335,12 @@
      
          my $strict_acl = RT->Config->Set( StrictLinkACL => 0 );
          push @results, ProcessTicketLinks(   TicketObj => $Ticket, ARGSRef => \%ARGS );
    +@@
    + $Queue => undef
    + @SelectedTickets => ()
    + $ForceShowHistory => 0
    ++$InlineEdit       => RT->Config->Get( 'InlineEdit', $session{CurrentUser} )
    + </%ARGS>
     
     diff --git a/html/RTIR/Incident/Display.html b/html/RTIR/Incident/Display.html
     --- a/html/RTIR/Incident/Display.html
2: ce4eae5e ! 2: c4b8f6bb Add inline edit to Incidents/Display.html page
    @@ -10,7 +10,7 @@
      % $m->callback( %ARGS, Ticket => $TicketObj, CallbackName => 'LeftColumnStart' );
      
     +<%PERL>
    -+    my $modify_url = RT->Config->Get('WebPath')."/RTIR/Incident/Edit.html?id=".$TicketObj->Id;
    ++    my $modify_url = RT::IR->HREFTo("Edit.html?id=".$TicketObj->Id),
     +    my $modify_inline
     +        = '<a class="inline-edit-toggle edit" href="%s">'
     +        . qq{<span class="fas fa-pencil-alt icon-bordered fa-2x" alt="$edit_label" data-toggle="tooltip" data-placement="top" data-original-title="$edit_label"></span>}
    @@ -165,8 +165,9 @@
          Object       => $TicketObj,
          title_href   => RT::IR->HREFTo("Edit.html"),
     -    InlineEdit   => ($can_modify || $can_modify_cf) ? 1 : 0,
    +-    ActionURL    => RT->Config->Get('WebPath')."/RTIR/Display.html"
     +    InlineEdit   => ($can_modify || $can_modify_cf) ? $InlineEdit : 0,
    -     ActionURL    => RT->Config->Get('WebPath')."/RTIR/Display.html"
    ++    ActionURL    => RT->Config->Get('WebPath')."/RTIR/Incident/Display.html"
      &>
      
     +<%PERL>
    @@ -207,6 +208,15 @@
      
      
     @@
    +     my $QueueObj = RT::Queue->new( $session{'CurrentUser'} );
    +     $QueueObj->Load( $Queue ) || Abort(loc("Couldn't load queue."));
    +     unless( RT::IR->IsIncidentQueue($QueueObj) ) {
    +-        return $m->comp('/RTIR/Display.html', %ARGS );
    ++        return $m->comp('/RTIR/Incident/Display.html', %ARGS );
    +     }
    +     ($TicketObj, @results) = CreateTicket( %ARGS );
    +     $new_ticket = 1;
    +@@
          $TicketObj = LoadTicket( $id );
      }
      
    @@ -223,6 +233,14 @@
      $m->callback(CallbackName => 'ProcessArguments', 
                  Ticket => $TicketObj,
                  ARGSRef => \%ARGS,  
    +             Actions => \@results);
    + 
    + unless( RT::IR->IsIncidentQueue($TicketObj->QueueObj) ) {
    +-    return $m->comp('/RTIR/Display.html', %ARGS );
    ++    return $m->comp('/RTIR/Incident/Display.html', %ARGS );
    + }
    + $ARGS{'id'} = $id = $TicketObj->Id;
    + 
     @@
      
      unless( $new_ticket ) {
    @@ -236,6 +254,6 @@
      $SelectedTicket => undef
      @SelectedTickets => ()
      $ForceShowHistory => 0
    -+$InlineEdit       => RT->Config->Get('InlineEdit', $session{CurrentUser})
    ++$InlineEdit       => RT->Config->Get( 'InlineEdit', $session{CurrentUser} )
      </%ARGS>
     
3: f3dd22c6 = 3: 3b8dfe7d Add ARG for /RTIR/Elements/ShowIncidents to add classes when in a form