X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rt%2Fshare%2Fhtml%2FApprovals%2FElements%2FPendingMyApproval;h=d677ce8e110bdf695c82b9c467a35dd737a41b9f;hb=44dd00a3ff974a17999e86e64488e996edc71e3c;hp=475cb428be76d633c31fe8e26e9690f9938972b3;hpb=7588a4ac90a9b07c08a3107cd1107d773be1c991;p=freeside.git diff --git a/rt/share/html/Approvals/Elements/PendingMyApproval b/rt/share/html/Approvals/Elements/PendingMyApproval index 475cb428b..d677ce8e1 100755 --- a/rt/share/html/Approvals/Elements/PendingMyApproval +++ b/rt/share/html/Approvals/Elements/PendingMyApproval @@ -2,7 +2,7 @@ %# %# COPYRIGHT: %# -%# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC +%# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC %# %# %# (Except where explicitly superseded by other copyright notices) @@ -55,17 +55,24 @@ % } <&| /Widgets/TitleBox, title => loc("Search for approvals") &> - /> <&|/l&>Show pending requests
- /> <&|/l&>Show approved requests
- /> <&|/l&>Show denied requests
- /> <&|/l&>Show requests awaiting other approvals
+ && qq[checked="checked"] |n%> /> +
-<&|/l_unsafe, qq{"&>Only show approvals for requests created before [_1]
+ /> +
-<&|/l_unsafe, qq{"&>Only show approvals for requests created after [_1] + /> +
+ + /> +
+ +<&|/l_unsafe, qq{"&>Only show approvals for requests created before [_1]
+ +<&|/l_unsafe, qq{"&>Only show approvals for requests created after [_1] <%init> @@ -80,27 +87,27 @@ my $created_before = RT::Date->new( $session{'CurrentUser'} ); my $created_after = RT::Date->new( $session{'CurrentUser'} ); foreach ($tickets, $group_tickets) { - $_->Limit( FIELD => 'Type', VALUE => 'approval' ); + $_->LimitType( VALUE => 'approval' ); if ( $ARGS{'ShowResolved'} ) { - $_->LimitStatus( VALUE => 'resolved' ); + $_->LimitStatus( VALUE => 'resolved' ); } if ( $ARGS{'ShowRejected'} ) { - $_->LimitStatus( VALUE => 'rejected' ); + $_->LimitStatus( VALUE => 'rejected' ); } if ( $ARGS{'ShowPending'} || ( !$ARGS{'ShowRejected'} && !$ARGS{'Resolved'} ) ) { - $_->LimitStatus( VALUE => 'open' ); - $_->LimitStatus( VALUE => 'new' ); - $_->LimitStatus( VALUE => 'stalled' ); + $_->LimitStatus( VALUE => 'open' ); + $_->LimitStatus( VALUE => 'new' ); + $_->LimitStatus( VALUE => 'stalled' ); } if ( $ARGS{'CreatedBefore'} ) { - $created_before->Set( Format => 'unknown', Value => $ARGS{'CreatedBefore'} ); - $_->LimitCreated( OPERATOR => "<=", VALUE => $created_before->ISO ); + $created_before->Set( Format => 'unknown', Value => $ARGS{'CreatedBefore'} ); + $_->LimitCreated( OPERATOR => "<=", VALUE => $created_before->ISO ); } if ( $ARGS{'CreatedAfter'} ) { - $created_after->Set( Format => 'unknown', Value => $ARGS{'CreatedAfter'} ); - $_->LimitCreated( OPERATOR => ">=", VALUE => $created_after->ISO ); + $created_after->Set( Format => 'unknown', Value => $ARGS{'CreatedAfter'} ); + $_->LimitCreated( OPERATOR => ">=", VALUE => $created_after->ISO ); } $_->OrderBy( FIELD => 'id' ); }