[Rt-commit] rtir branch, 2.9-trunk, updated. 2.6.1rc1-339-gd4e8086
Ruslan Zakirov
ruz at bestpractical.com
Thu Aug 25 21:31:06 EDT 2011
The branch, 2.9-trunk has been updated
via d4e8086550cf963168d87f3cdd3b80d116421625 (commit)
via cee6e387b485a281ceb339a4ee024ccf4e84408e (commit)
via 0cc3189c18e7f31d443392ee13effbcd64ccfd78 (commit)
via dd8774a32706d5b8fe9644fb9f427a47bcdc62b1 (commit)
via 41b5e91c44e407ac25ac9147df655cbfdc3f36bf (commit)
via a99fe84f3f2c9e27fbe28f87684e5f8a016b79f5 (commit)
via b1290723d1d12f2ded2f5de80878d1d2c7d06b08 (commit)
via d35471b00edc0c6ba3b2daa79f9b99aa012a8d58 (commit)
via 05d402bbdbd124f1d427af92153e2135521b4ca0 (commit)
from bdbff28afc102f3d16a5a8cfe7045348071b02d7 (commit)
Summary of changes:
TODO.porting_over_RT4 | 9 ----
etc/RTIR_Config.pm | 8 ++--
etc/upgrade/2.9.0/content | 48 ++++++++++++++++++++
html/Callbacks/RTIR/Elements/Tabs/Privileged | 10 ++++-
.../Elements/EditCustomFields/MassageCustomFields | 2 +-
html/RTIR/Elements/ShowChildren | 14 +++---
html/RTIR/Incident/BulkAbandon.html | 27 +++++------
html/RTIR/Incident/Children/index.html | 22 +++++-----
html/RTIR/Incident/Elements/ShowChildren | 12 +++---
t/002-test-reject.t | 6 +-
10 files changed, 101 insertions(+), 57 deletions(-)
- Log -----------------------------------------------------------------
commit 05d402bbdbd124f1d427af92153e2135521b4ca0
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 01:07:15 2011 +0400
delete Queue and Status arguments from BulkAbandon
it's always incidents and abandoned right now. Status
should be in config
diff --git a/html/RTIR/Incident/BulkAbandon.html b/html/RTIR/Incident/BulkAbandon.html
index 322dbfe..f5832b7 100644
--- a/html/RTIR/Incident/BulkAbandon.html
+++ b/html/RTIR/Incident/BulkAbandon.html
@@ -33,9 +33,9 @@
<%PERL>
# XXX: cache result set to check if get empty results
my $result_set = $m->scomp('/RTIR/Search/Elements/ShowResults',
- Queue => $Queue,
- BaseURL => $BaseURL,
- BaseQuery => RT::IR->Query( Queue => $Queue ),
+ Queue => 'Incidents',
+ BaseURL => 'RTIR/Incident/BulkAbandon.html',
+ BaseQuery => RT::IR->Query( Queue => 'Incidents' ),
Query => $Query,
DisplayFormat => "__CheckBox__, $Format",
Format => $Format,
@@ -81,6 +81,7 @@ my @CheckBox = (
);
my $title = loc('Abandon Incidents');
my $SubmitCaption = loc("Abandon selected incidents");
+my $Status = 'abandoned';
my ( @results );
@@ -152,15 +153,10 @@ if ( $ARGS{'BulkAbandon'} ) {
# force redo search if we changed tickets
$session{'tickets'}->RedoSearch if $session{'tickets'};
}
-my $BaseURL = "RTIR/Incident/BulkAbandon.html?"
- . $m->comp('/Elements/QueryString', Queue => $Queue, Status => $Status);
</%INIT>
<%ARGS>
-$Status => 'abandoned'
-$Queue => 'Incidents'
-
-$Query => RT::IR->ActiveQuery( Queue => $Queue )
+$Query => RT::IR->ActiveQuery( Queue => 'Incidents' )
$Format => RT->Config->Get('RTIRSearchResultFormats')->{'AbandonIncidents'}
$Rows => 50
$Page => 1
commit d35471b00edc0c6ba3b2daa79f9b99aa012a8d58
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 01:11:04 2011 +0400
drop variables used only once
diff --git a/html/RTIR/Incident/BulkAbandon.html b/html/RTIR/Incident/BulkAbandon.html
index f5832b7..3437954 100644
--- a/html/RTIR/Incident/BulkAbandon.html
+++ b/html/RTIR/Incident/BulkAbandon.html
@@ -22,7 +22,7 @@
%#
%#
%# END LICENSE BLOCK
-<& /RTIR/Elements/Header, Title => $title &>
+<& /RTIR/Elements/Header, Title => loc('Abandon Incidents') &>
<& /Elements/Tabs &>
<& /Elements/ListActions, actions => \@results &>
@@ -64,8 +64,8 @@ my $result_set = $m->scomp('/RTIR/Search/Elements/ShowResults',
<& /Elements/Submit,
Name => "BulkAbandon",
- Caption => $SubmitCaption,
- Label => loc("Reject"),
+ Caption => loc("Abandon selected incidents"),
+ Label => loc("Abandon"),
CheckAll => 1, ClearAll => 1,
CheckboxName => 'SelectedTickets',
&>
@@ -79,8 +79,6 @@ my @CheckBox = (
{ Value => 'Incident Reports', Title => loc("Reply to all reports") },
{ Value => 'Investigations', Title => loc("Reply to all investigations") },
);
-my $title = loc('Abandon Incidents');
-my $SubmitCaption = loc("Abandon selected incidents");
my $Status = 'abandoned';
my ( @results );
commit b1290723d1d12f2ded2f5de80878d1d2c7d06b08
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 01:20:52 2011 +0400
preserve search properties on form submits
diff --git a/html/RTIR/Incident/BulkAbandon.html b/html/RTIR/Incident/BulkAbandon.html
index 3437954..79ffc1d 100644
--- a/html/RTIR/Incident/BulkAbandon.html
+++ b/html/RTIR/Incident/BulkAbandon.html
@@ -28,7 +28,10 @@
<& /Elements/ListActions, actions => \@results &>
<form action="<%RT->Config->Get('WebPath')%>/RTIR/Incident/BulkAbandon.html" method="post">
-<input type="hidden" name="Status" value="<% $Status %>" />
+% foreach my $arg (qw(Query Format Rows Page OrderBy Order) ) {
+% next unless defined $ARGS{ $arg } && length $ARGS{ $arg };
+<input type="hidden" name="<% $arg %>" value="<% $ARGS{ $arg } %>" />
+% }
<%PERL>
# XXX: cache result set to check if get empty results
commit a99fe84f3f2c9e27fbe28f87684e5f8a016b79f5
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 01:30:51 2011 +0400
try harder in figuring out queue in tabs
diff --git a/html/Callbacks/RTIR/Elements/Tabs/Privileged b/html/Callbacks/RTIR/Elements/Tabs/Privileged
index 55bdead..91c3d84 100644
--- a/html/Callbacks/RTIR/Elements/Tabs/Privileged
+++ b/html/Callbacks/RTIR/Elements/Tabs/Privileged
@@ -350,6 +350,14 @@ if ( $request_path =~ m{^/RTIR/(?:$re_rtir_types/)?(Display|Edit|Update|Reply)\.
} elsif ( $request_path =~ m{^/RTIR/(Search/|Incident/BulkAbandon\.html$)} ) {
my $queue = $args->{'Queue'} || '';
unless ( $queue ) {
+ if ( $request_path =~ /Incident/ ) {
+ $queue = 'Incidents';
+ }
+ elsif ( $request_path =~ /Report/ ) {
+ $queue = 'Incident Reports';
+ }
+ }
+ unless ( $queue ) {
my (undef, @queues) = RT::IR->OurQuery( $args->{'Query'} );
$queue = $queues[0] if @queues == 1;
}
commit 41b5e91c44e407ac25ac9147df655cbfdc3f36bf
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 02:51:46 2011 +0400
tabs for bulk reject
diff --git a/html/Callbacks/RTIR/Elements/Tabs/Privileged b/html/Callbacks/RTIR/Elements/Tabs/Privileged
index 91c3d84..5255f15 100644
--- a/html/Callbacks/RTIR/Elements/Tabs/Privileged
+++ b/html/Callbacks/RTIR/Elements/Tabs/Privileged
@@ -347,7 +347,7 @@ if ( $request_path =~ m{^/RTIR/(?:$re_rtir_types/)?(Display|Edit|Update|Reply)\.
back => title => loc('Back to ticket #[_1]', $id),
path => "/RTIR/Display.html?id=$id",
);
-} elsif ( $request_path =~ m{^/RTIR/(Search/|Incident/BulkAbandon\.html$)} ) {
+} elsif ( $request_path =~ m{^/RTIR/(Search/|Incident/BulkAbandon\.html$|Report/BulkReject\.html$)} ) {
my $queue = $args->{'Queue'} || '';
unless ( $queue ) {
if ( $request_path =~ /Incident/ ) {
commit dd8774a32706d5b8fe9644fb9f427a47bcdc62b1
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 03:36:50 2011 +0400
update TODO
diff --git a/TODO.porting_over_RT4 b/TODO.porting_over_RT4
index 30e1ec0..ba77405 100644
--- a/TODO.porting_over_RT4
+++ b/TODO.porting_over_RT4
@@ -44,8 +44,6 @@
* Don't see Articles on IR's Update.html
-* BulkAbandon misses Query arguments when updated
-
* /Incident/Reply.html needs refine query page
=== DOCS
commit 0cc3189c18e7f31d443392ee13effbcd64ccfd78
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 04:27:53 2011 +0400
during upgrade delete /RTIR/Elements/QueueSummary portlet
diff --git a/TODO.porting_over_RT4 b/TODO.porting_over_RT4
index ba77405..a3c9f6a 100644
--- a/TODO.porting_over_RT4
+++ b/TODO.porting_over_RT4
@@ -22,9 +22,6 @@
* upgrade script that renames wrongly named scrips, we have
a few scrips that named wrongly
-* replace /RTIR/Elements/QueueSummary with RT's QuickSearch
- in user's settings for RTIR's home page
-
=== BRINGING UP TO DATE
* Some pages with forms need new nice layouts like in RT, reply
diff --git a/etc/upgrade/2.9.0/content b/etc/upgrade/2.9.0/content
index 9a7deac..190fcdc 100644
--- a/etc/upgrade/2.9.0/content
+++ b/etc/upgrade/2.9.0/content
@@ -310,4 +310,52 @@ our @Final = (
# started date is handled by lifecycles now
remove_scrip_condition('RTIR_RequireStateChange');
},
+
+ sub {
+ my ($d_portlets) = RT::System->new( RT->SystemUser )
+ ->Attributes->Named('RTIR_HomepageSettings');
+ my $content = $d_portlets->Content;
+ if ( process_home_page_settings( $content ) ) {
+ my ($status, $msg) = $d_portlets->SetContent( $content );
+ $RT::Logger->error("Couldn't update content: $msg")
+ unless $status;
+ }
+
+ my $attrs = RT::Attributes->new( RT->SystemUser );
+ $attrs->Limit( FIELD => 'ObjectType', VALUE => 'RT::User' );
+ $attrs->Limit( FIELD => 'Name', VALUE => 'Pref-RTIR_HomepageSettings' );
+ while ( my $attr = $attrs->Next ) {
+ my $content = $attr->Content;
+ if ( process_home_page_settings( $content ) ) {
+ my ($status, $msg) = $attr->SetContent( $content );
+ $RT::Logger->error("Couldn't update content: $msg")
+ unless $status;
+ }
+ }
+ },
);
+
+
+sub process_home_page_settings {
+ my $content = shift || {};
+ my $found = 0;
+ my $has_quicksearch =
+ grep $_->{'type'} eq 'component' && $_->{'name'} eq 'Quicksearch',
+ map @$_, grep $_, values %$content
+ ;
+ foreach my $a ( grep $_, values %$content ) {
+ foreach my $e ( splice @$a ) {
+ if (
+ $e->{type} eq 'component'
+ && $e->{name} eq '/RTIR/Elements/QueueSummary'
+ ) {
+ $found = 1;
+ $e->{name} = 'Quicksearch';
+ next if $has_quicksearch;
+ }
+ push @$a, $e;
+ }
+ }
+ return $found;
+}
+
commit cee6e387b485a281ceb339a4ee024ccf4e84408e
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 04:52:44 2011 +0400
replace State search formats with Status
diff --git a/etc/RTIR_Config.pm b/etc/RTIR_Config.pm
index adb41a2..f87dd26 100644
--- a/etc/RTIR_Config.pm
+++ b/etc/RTIR_Config.pm
@@ -294,7 +294,7 @@ Set($RTIRSearchResultFormats, {
ReportDefault =>
q{'<b><a HREF="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></b>/TITLE:#',
'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></b>/TITLE:Subject',
- '__CustomField.{State}__/TITLE:State',
+ __Status__,
__LastUpdatedRelative__,
__CreatedRelative__,
__NEWLINE__,
@@ -302,7 +302,7 @@ Set($RTIRSearchResultFormats, {
InvestigationDefault =>
q{'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></b>/TITLE:#',
'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></b>/TITLE:Subject',
- '__CustomField.{State}__/TITLE:State',
+ __Status__,
__LastUpdatedRelative__,
__CreatedRelative__,
__NEWLINE__,
@@ -311,7 +311,7 @@ Set($RTIRSearchResultFormats, {
BlockDefault =>
q{'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></b>/TITLE:#',
'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></b>/TITLE:Subject',
- '__CustomField.{State}__/TITLE:State',
+ __Status__,
__LastUpdatedRelative__,
__CreatedRelative__,
__NEWLINE__,
@@ -320,7 +320,7 @@ Set($RTIRSearchResultFormats, {
IncidentDefault =>
q{'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a></b>/TITLE:#',
'<b><a href="__WebPath__/Ticket/Display.html?id=__id__">__Subject__</a></b>/TITLE:Subject',
- '__CustomField.{State}__/TITLE:State',
+ __Status__,
__LastUpdatedRelative__,
__CreatedRelative__,
__Priority__,
commit d4e8086550cf963168d87f3cdd3b80d116421625
Author: Ruslan Zakirov <ruz at bestpractical.com>
Date: Fri Aug 26 04:53:30 2011 +0400
drop State word from the code
diff --git a/TODO.porting_over_RT4 b/TODO.porting_over_RT4
index a3c9f6a..ef031fb 100644
--- a/TODO.porting_over_RT4
+++ b/TODO.porting_over_RT4
@@ -49,10 +49,6 @@
=== CLEANUP && REFACTORING
-* /Incident/Children/ and friends use "State" all over the place,
- anyway we break backwards compatibility, let's be consistent
- and ditch the word
-
* make Submit buttons names consistent with RT's
* move html/RTIR/Incident/LinkArticles.html -> html/RTIR/Link/Articles.html
diff --git a/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields b/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields
index f487169..2ec67a2 100644
--- a/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields
+++ b/html/Callbacks/RTIR/Ticket/Elements/EditCustomFields/MassageCustomFields
@@ -7,7 +7,7 @@ $QueueObj => undef
my $queue = $QueueObj || $TicketObj->QueueObj;
return unless RT::IR->OurQueue( $queue );
-# We never want to see the RTIR custom fields State and Constituency in the edity ui
+# We never want to see the RTIR's custom field Constituency in the edity ui
$CustomFields->_OpenParen('RTIR');
$CustomFields->Limit( SUBCLAUSE => 'RTIR', ENTRYAGGREGATOR => 'AND', FIELD => 'Name', OPERATOR => '!=', VALUE => 'Constituency');
$CustomFields->_CloseParen('RTIR');
diff --git a/html/RTIR/Elements/ShowChildren b/html/RTIR/Elements/ShowChildren
index 1734593..e1992ce 100644
--- a/html/RTIR/Elements/ShowChildren
+++ b/html/RTIR/Elements/ShowChildren
@@ -23,10 +23,10 @@
%#
%# END LICENSE BLOCK
-% if( $ShowStatesSelector ) {
+% if( $ShowStatusesSelector ) {
% foreach my $s ( $QueueObj->Lifecycle->Valid ) {
-% my $checked = (grep { $_ eq $s } @States)? 'checked': '';
-<input type="checkbox" name="States" value="<% $s %>" <% $checked %> /> <% $s %>
+% my $checked = (grep { $_ eq $s } @Statuses)? 'checked': '';
+<input type="checkbox" name="Statuses" value="<% $s %>" <% $checked %> /> <% $s %>
% }
<& /Elements/Submit, Name => 'RefineStatus', Label => loc('Filter status') &>
% }
@@ -67,7 +67,7 @@ unless ( $QueueObj->id ) {
return;
}
- at States = $QueueObj->Lifecycle->Valid('initial', 'active') unless @States;
+ at Statuses = $QueueObj->Lifecycle->Valid('initial', 'active') unless @Statuses;
my $Type = RT::IR::TicketType( Queue => $Queue );
@@ -77,7 +77,7 @@ my $children = RT::Tickets->new( $session{'CurrentUser'} );
$children->FromSQL( RT::IR->Query(
Queue => $Queue,
MemberOf => $Ticket,
- Status => [@States],
+ Status => [@Statuses],
));
</%INIT>
@@ -93,8 +93,8 @@ $Delete => 0
$FullList => undef
$NoTicketsCaption => undef,
- at States => ()
+ at Statuses => ()
$ShowHeader => 0
-$ShowStatesSelector => 0
+$ShowStatusesSelector => 0
</%ARGS>
diff --git a/html/RTIR/Incident/Children/index.html b/html/RTIR/Incident/Children/index.html
index ec7fd32..827edc5 100644
--- a/html/RTIR/Incident/Children/index.html
+++ b/html/RTIR/Incident/Children/index.html
@@ -38,13 +38,13 @@
<input type="hidden" name="Queue" value="<% $Queue %>" />
<& /RTIR/Elements/ShowChildren,
- Ticket => $Incident,
- Queue => $Queue,
- States => [@States],
- FullList => RT->Config->Get('WebPath')."/RTIR/Incident/Children/?Queue=$Queue&id=$id",
- Delete => $delete,
- ShowHeader => 1,
- ShowStatesSelector => 1,
+ Ticket => $Incident,
+ Queue => $Queue,
+ Statuses => [@Statuses],
+ FullList => RT->Config->Get('WebPath')."/RTIR/Incident/Children/?Queue=$Queue&id=$id",
+ Delete => $delete,
+ ShowHeader => 1,
+ ShowStatusesSelector => 1,
&>
<& /Elements/Submit, Name => 'Unlink', Label => loc('Unlink Report') &>
@@ -77,14 +77,14 @@ my $Title = loc("$Queue for Incident #[_1]: [_2]", $id, $Incident->Subject);
my $delete = $Incident->CurrentUserHasRight('ModifyTicket') ? 1: 0;
- at States = RT::IR->Statuses( Queue => $Queue )
- unless @States;
+ at Statuses = RT::IR->Statuses( Queue => $Queue )
+ unless @Statuses;
my $children = RT::Tickets->new( $session{'CurrentUser'} );
$children->FromSQL( RT::IR->Query(
Queue => $Queue,
MemberOf => $Incident,
- Status => [@States],
+ Status => [@Statuses],
) );
my $all_children = RT::Tickets->new( $session{'CurrentUser'} );
@@ -98,5 +98,5 @@ $id => undef
$Queue => 'Incident Reports'
@SelectedTickets => ()
- at States => ()
+ at Statuses => ()
</%ARGS>
diff --git a/html/RTIR/Incident/Elements/ShowChildren b/html/RTIR/Incident/Elements/ShowChildren
index ddb9203..d1844a1 100644
--- a/html/RTIR/Incident/Elements/ShowChildren
+++ b/html/RTIR/Incident/Elements/ShowChildren
@@ -9,7 +9,7 @@
Ticket => $IncidentObj,
Queue => $Queue,
Rows => $Rows,
- States => \@active_states,
+ Statuses => \@active_statuses,
NoTicketsCaption => loc('No active [_1]', loc( $Queue )),
&>
% if ( $active->CountAll < $Rows ) {
@@ -17,7 +17,7 @@
Ticket => $IncidentObj,
Queue => $Queue,
Rows => $Rows - $active->CountAll,
- States => \@inactive_states,
+ Statuses => \@inactive_statuses,
NoTicketsCaption => loc('No inactive [_1]', loc( $Queue )),
&>
% }
@@ -37,21 +37,21 @@ return if $Queue eq 'Blocks' && RT->Config->Get('RTIR_DisableBlocksQueue');
my $id = $IncidentObj->id;
my $EscapedQueue = $m->interp->apply_escapes( $Queue, 'u' );
-my @active_states = RT::IR->Statuses( Queue => $Queue );
-my @inactive_states = RT::IR->Statuses( Queue => $Queue, Initial => 0, Active => 0, Inactive => 1 );
+my @active_statuses = RT::IR->Statuses( Queue => $Queue );
+my @inactive_statuses = RT::IR->Statuses( Queue => $Queue, Initial => 0, Active => 0, Inactive => 1 );
my $active = RT::Tickets->new( $session{'CurrentUser'} );
$active->FromSQL( RT::IR->Query(
Queue => $Queue,
MemberOf => $IncidentObj,
- Status => \@active_states,
+ Status => \@active_statuses,
));
my $inactive = RT::Tickets->new( $session{'CurrentUser'} );
$inactive->FromSQL( RT::IR->Query(
Queue => $Queue,
MemberOf => $IncidentObj,
- Status => \@inactive_states,
+ Status => \@inactive_statuses,
));
my $total_count = $active->CountAll + $inactive->CountAll;
diff --git a/t/002-test-reject.t b/t/002-test-reject.t
index 8106940..2517ab4 100644
--- a/t/002-test-reject.t
+++ b/t/002-test-reject.t
@@ -94,7 +94,7 @@ diag "test that after reject links to incidents are still there" if $ENV{'TEST_V
$agent->display_ticket( $inc_id);
$agent->follow_link_ok({text => "Incident Reports", n => 2}, "Followed 'Incident Reports' link");
$agent->form_number(3);
- $agent->tick( States => 'rejected' );
+ $agent->tick( Statuses => 'rejected' );
$agent->click('RefineStatus');
$agent->has_tag('a', "$id", 'we have link to ticket');
@@ -124,7 +124,7 @@ diag "test that after quick reject links to incidents are still there" if $ENV{'
$agent->display_ticket( $inc_id);
$agent->follow_link_ok({text => "Incident Reports", n => 2}, "Followed 'Incident Reports' link");
$agent->form_number(3);
- $agent->tick( States => 'rejected' );
+ $agent->tick( Statuses => 'rejected' );
$agent->click('RefineStatus');
$agent->has_tag('a', "$id", 'we have link to ticket');
@@ -163,7 +163,7 @@ diag "test that after bulk reject links to incidents are still there" if $ENV{'T
$agent->display_ticket( $inc_id);
$agent->follow_link_ok({text => "Incident Reports", n => 2}, "Followed 'Incident Reports' link");
$agent->form_number(3);
- $agent->tick( States => 'rejected' );
+ $agent->tick( Statuses => 'rejected' );
$agent->click('RefineStatus');
$agent->has_tag('a', "$id", 'we have link to ticket');
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list