[Rt-commit] [svn] r1433 - in rtir/branches/1.1/html/RTIR: .
Incident Report Search Search/Elements
leira at pallas.eruditorum.org
leira at pallas.eruditorum.org
Tue Sep 7 01:22:45 EDT 2004
Author: leira
Date: Tue Sep 7 01:22:45 2004
New Revision: 1433
Added:
rtir/branches/1.1/html/RTIR/Search/Refine.html
Removed:
rtir/branches/1.1/html/RTIR/Bulk.html
rtir/branches/1.1/html/RTIR/Search/LinkRefine.html
rtir/branches/1.1/html/RTIR/Search/MergeRefine.html
rtir/branches/1.1/html/RTIR/Search/RejectRefine.html
Modified:
rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
rtir/branches/1.1/html/RTIR/Merge.html
rtir/branches/1.1/html/RTIR/Report/BulkReject.html
rtir/branches/1.1/html/RTIR/Search/Elements/BuildQuery
rtir/branches/1.1/html/RTIR/Search/Elements/ProcessQuery
rtir/branches/1.1/html/RTIR/Search/Elements/Refine
rtir/branches/1.1/html/RTIR/Search/Results.html
Log:
Combine all FooRefine files into Refine.html, and use that instead.
Modified: rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html (original)
+++ rtir/branches/1.1/html/RTIR/Incident/LinkToIncident.html Tue Sep 7 01:22:45 2004
@@ -27,7 +27,7 @@
Refresh => $session{'tickets_refresh_interval'} &>
<& '/RTIR/Search/Elements/RefineTabs',
- path => "RTIR/Search/LinkRefine.html?Queue=Incidents&id=$id$QueryString",
+ path => $path,
current_tab => "RTIR/Incident/LinkToIncident.html?id=$id",
Ticket => $ChildObj,
Queue => 'Incidents',
@@ -90,6 +90,8 @@
$Query = "$BaseQuery AND ( $Query )";
$ARGS{'Query'} = $Query;
+my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL&Queue=Incidents&id=$id$QueryString",
+
</%INIT>
<%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Merge.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Merge.html (original)
+++ rtir/branches/1.1/html/RTIR/Merge.html Tue Sep 7 01:22:45 2004
@@ -25,7 +25,7 @@
<& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'} &>
<& '/RTIR/Search/Elements/RefineTabs',
- path => "RTIR/Search/MergeRefine.html?Queue=" . $Ticket->QueueObj->Name . "&id=$id$QueryString",
+ path => $path,
Ticket => $Ticket,
current_subtab => "RTIR/Merge.html?id=".$Ticket->Id. "$QueryString",
Queue => $Queue,
@@ -45,7 +45,7 @@
% $m->abort();
% }
-<form action="Merge.html" method="post">
+<form action="<%$RT::WebPath%>/RTIR/Merge.html" method="post">
<input type="hidden" name="id" value="<%$Ticket->id%>">
<input type="hidden" name="<%$Ticket->Id%>-MergeInto">
@@ -54,7 +54,8 @@
Query => $Query,
QueryString => $QueryString,
BaseURL => $RT::WebPath."/RTIR/Merge.html?id=$id&",
- %ARGS &>
+ Format => $Format,
+ &>
<HR>
@@ -63,7 +64,6 @@
<%INIT>
$Format = $RT::RTIRMergeSearchResultFormat;
-$ARGS{'Format'} = $Format;
my $Ticket = LoadTicket($id);
my $Queue = $Ticket->QueueObj->Name;
@@ -103,7 +103,8 @@
}
$Query = "$BaseQuery AND ( $Query )";
-$ARGS{'Query'} = $Query;
+
+my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL&Queue=" . $Ticket->QueueObj->Name . "&id=$id&$QueryString";
</%INIT>
@@ -117,4 +118,5 @@
$OrderBy => 'id'
$Order => 'ASC'
$id => undef
+$BaseURL => '/RTIR/Merge.html'
</%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Report/BulkReject.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Report/BulkReject.html (original)
+++ rtir/branches/1.1/html/RTIR/Report/BulkReject.html Tue Sep 7 01:22:45 2004
@@ -27,7 +27,7 @@
Refresh => $session{'tickets_refresh_interval'} &>
<& '/RTIR/Search/Elements/RefineTabs',
- path => "RTIR/Search/RejectRefine.html?Queue=$Queue$QueryString",
+ path => $path,
Queue => $Queue,
current_tab => $current_tab,
Title => $title,
@@ -41,7 +41,7 @@
<& /RTIR/Elements/ListActions, actions => \@results &>
-<form method=get>
+<form action="<%$RT::WebPath%>/RTIR/Report/BulkReject.html" method=get>
<input type=hidden name=Status value=<%$Status%>>
<input type=hidden name=BulkReject value=1>
@@ -50,7 +50,8 @@
Query => $Query,
QueryString => $QueryString,
BaseURL => $BaseURL,
- %ARGS &>
+ Format => $Format,
+ &>
<a href="BulkReject.html?check=check">[Select All]</a>
<a href="BulkReject.html?check=uncheck">[Unselect All]</a>
@@ -60,7 +61,6 @@
<%INIT>
$Format = $RT::RTIRRejectSearchResultFormat;
-$ARGS{'Format'} = $Format;
my $title = loc("Reject Incident Reports");
my $SubmitCaption = loc("Reject selected incident reports");
@@ -122,7 +122,8 @@
}
$Query = "$BaseQuery AND ( $Query )";
-$ARGS{'Query'} = $Query;
+
+my $path = "RTIR/Search/Refine.html?ResultPage=$BaseURL&Queue=$Queue$QueryString";
</%INIT>
Modified: rtir/branches/1.1/html/RTIR/Search/Elements/BuildQuery
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Elements/BuildQuery (original)
+++ rtir/branches/1.1/html/RTIR/Search/Elements/BuildQuery Tue Sep 7 01:22:45 2004
@@ -51,6 +51,7 @@
<input type=hidden name=BaseQuery value="<%$BaseQuery%>">
<input type=hidden name=Queue value="<%$ARGS{'Queue'}%>">
<input type=hidden name=id value="<%$ARGS{'id'}%>">
+<input type=hidden name=ResultPage value="<%$ARGS{'ResultPage'}%>">
<table width=100%>
<tr>
<td valign=top class="boxcontainer">
Modified: rtir/branches/1.1/html/RTIR/Search/Elements/ProcessQuery
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Elements/ProcessQuery (original)
+++ rtir/branches/1.1/html/RTIR/Search/Elements/ProcessQuery Tue Sep 7 01:22:45 2004
@@ -659,7 +659,7 @@
# {{{ Show the results, if we were asked.
if ( $ARGS{"DoSearch"} ) {
- $m->comp($ResultPage, Query => $Query, Format => $Format, Order => $Order, OrderBy => $OrderBy, Rows => $RowsPerPage, BaseQuery => $BaseQuery, Queue => $ARGS{'Queue'}, id => $ARGS{'id'});
+ $m->comp($RT::WebPath . $ResultPage, Query => $Query, Format => $Format, Order => $Order, OrderBy => $OrderBy, Rows => $RowsPerPage, BaseQuery => $BaseQuery, Queue => $ARGS{'Queue'}, id => $ARGS{'id'});
$m->abort();
}
# }}}
Modified: rtir/branches/1.1/html/RTIR/Search/Elements/Refine
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Elements/Refine (original)
+++ rtir/branches/1.1/html/RTIR/Search/Elements/Refine Tue Sep 7 01:22:45 2004
@@ -43,88 +43,7 @@
%# those contributions and any derivatives thereof.
%#
%# }}} END BPS TAGGED BLOCK
-<& /RTIR/Search/Elements/BuildQuery,
- queues => \%queues,
- actions => $results,
- optionlist => $optionlist,
- search_hash => $search_hash,
- dirty => $dirty,
- AvailableColumns => $AvailableColumns,
- CurrentFormat => $CurrentFormat,
- BaseQuery => $BaseQuery,
- FormAction => $FormAction,
- %ARGS &>
-<%INIT>
-my $Ticket = new RT::Ticket($session{'CurrentUser'});
-$Ticket->Load($id);
-
-my %queues = ();
-my $results;
-my $optionlist;
-my $search_hash;
-my $dirty;
-my $AvailableColumns;
-my $CurrentFormat;
-
-my $BaseQuery = $m->comp('/RTIR/Elements/BaseQuery', Queue => $Queue);
-
-my $QueryString;
-if ($NewQuery) {
- # If it's a new query, wipe it ourselves...
-
- # Wipe all data-carrying variables clear if we want a new
- # search, or we're deleting an old one..
-
- $Query = '';
- $Format = '';
- $Order = '';
- $OrderBy = '';
- $Rows = '';
- # ($search hasn't been set yet; no need to clear)
-
- $m->comp('Elements/ClearQuery', %ARGS);
-
- # and replace it with our standard new query...
-
- $ARGS{'Query'} = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
- $Query = $ARGS{'Query'};
-
- # and claim it isn't a new query any more
-
- $ARGS{'NewQuery'} = 0;
-}
-
-( $Query, $Format, $Order, $OrderBy, $Rows ) =
- $m->comp('/RTIR/Search/Elements/ProcessQuery',
- queues => \%queues,
- results => \$results,
- optionlist => \$optionlist,
- search_hash => \$search_hash,
- dirty => \$dirty,
- AvailableColumns => \$AvailableColumns,
- CurrentFormat => \$CurrentFormat,
- BaseQuery => $BaseQuery,
- ResultPage => $ResultPage,
- id => $id,
- %ARGS);
-
-my ($Type, @states) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
-
-# {{{ Build a querystring for the tabs
-
- $QueryString = '&' . $m->comp('/Elements/QueryString',
- Query => $Query,
- Format => $Format,
- Order => $Order,
- OrderBy => $OrderBy,
- Rows => $Rows) if ($Query);
-# }}}
-
-$ARGS{'Query'} = $Query;
-
-my $path = $BaseURL."?Queue=$Queue&id=".$id.$QueryString;
-</%INIT>
<%ARGS>
$title => loc("Query Builder")
Added: rtir/branches/1.1/html/RTIR/Search/Refine.html
==============================================================================
--- (empty file)
+++ rtir/branches/1.1/html/RTIR/Search/Refine.html Tue Sep 7 01:22:45 2004
@@ -0,0 +1,169 @@
+%# {{{ BEGIN BPS TAGGED BLOCK
+%#
+%# COPYRIGHT:
+%#
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC
+%# <jesse at bestpractical.com>
+%#
+%# (Except where explicitly superseded by other copyright notices)
+%#
+%#
+%# LICENSE:
+%#
+%# This work is made available to you under the terms of Version 2 of
+%# the GNU General Public License. A copy of that license should have
+%# been provided with this software, but in any event can be snarfed
+%# from www.gnu.org.
+%#
+%# This work is distributed in the hope that it will be useful, but
+%# WITHOUT ANY WARRANTY; without even the implied warranty of
+%# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+%# General Public License for more details.
+%#
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%#
+%#
+%# CONTRIBUTION SUBMISSION POLICY:
+%#
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
+%#
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%#
+%# }}} END BPS TAGGED BLOCK
+<& /Elements/Header, Title => $title &>
+
+ResultPage: <%$ResultPage%><br>
+<& '/RTIR/Search/Elements/RefineTabs',
+ path => $path,
+ current_tab => $current_tab,
+ current_subtab => $ResultPage."?Queue=$Queue&id=".$id.$QueryString,
+ Ticket => $Ticket,
+ Queue => 'Incident Reports',
+ Title => $title,
+ Format => $Format,
+ Query => $Query,
+ Rows => $Rows,
+ OrderBy => $OrderBy,
+ Order => $Order,
+ QueryString => $QueryString,
+&>
+
+Refine.html<br>
+
+<& /RTIR/Search/Elements/BuildQuery,
+ queues => \%queues,
+ actions => $results,
+ optionlist => $optionlist,
+ search_hash => $search_hash,
+ dirty => $dirty,
+ AvailableColumns => $AvailableColumns,
+ CurrentFormat => $CurrentFormat,
+ BaseQuery => $BaseQuery,
+ FormAction => $FormAction,
+ ResultPage => $ResultPage,
+ %ARGS &>
+
+<%INIT>
+if (!$Ticket && $id) {
+ my $Ticket = new RT::Ticket($session{'CurrentUser'});
+ $Ticket->Load($id);
+}
+
+my %queues = ();
+my $results;
+my $optionlist;
+my $search_hash;
+my $dirty;
+my $AvailableColumns;
+my $CurrentFormat;
+
+my $BaseQuery = $m->comp('/RTIR/Elements/BaseQuery', Queue => $Queue);
+
+if ($NewQuery) {
+ # If it's a new query, wipe it ourselves...
+
+ # Wipe all data-carrying variables clear if we want a new
+ # search, or we're deleting an old one..
+
+ $Query = '';
+ $Format = '';
+ $Order = '';
+ $OrderBy = '';
+ $Rows = '';
+ # ($search hasn't been set yet; no need to clear)
+
+ $m->comp('Elements/ClearQuery', %ARGS);
+
+ # and replace it with our standard new query...
+
+ $ARGS{'Query'} = $m->comp('/RTIR/Elements/NewQuery', Queue => $Queue);
+ $Query = $ARGS{'Query'};
+
+ # and claim it isn't a new query any more
+
+ $ARGS{'NewQuery'} = 0;
+}
+
+( $Query, $Format, $Order, $OrderBy, $Rows ) =
+ $m->comp('/RTIR/Search/Elements/ProcessQuery',
+ queues => \%queues,
+ results => \$results,
+ optionlist => \$optionlist,
+ search_hash => \$search_hash,
+ dirty => \$dirty,
+ AvailableColumns => \$AvailableColumns,
+ CurrentFormat => \$CurrentFormat,
+ BaseQuery => $BaseQuery,
+ ResultPage => $ResultPage,
+ id => $id,
+ %ARGS);
+
+my ($Type, @states) = $m->comp("/RTIR/Elements/Type", Queue => $Queue);
+
+# {{{ Build a querystring for the tabs
+
+ $QueryString = '&' . $m->comp('/Elements/QueryString',
+ Query => $Query,
+ Format => $Format,
+ Order => $Order,
+ OrderBy => $OrderBy,
+ Rows => $Rows) if ($Query);
+# }}}
+
+$ARGS{'Query'} = $Query;
+
+my $path = $BaseURL."?Queue=$Queue&id=".$id.$QueryString;
+</%INIT>
+
+<%ARGS>
+$Ticket => undef
+$title => loc("Query Builder")
+$ResultPage => undef
+$BaseURL => 'RTIR/Search/Refine.html'
+$NewQuery => 0
+$Queue => undef
+$Query => undef
+$QueryString => undef
+$id => undef
+$FormAction => 'Refine.html'
+$Format => undef
+$HideResults => 0
+$Rows => 50
+$Page => 1
+$OrderBy => 'id'
+$Order => 'ASC'
+$current_tab => undef
+</%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Search/Results.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/Results.html (original)
+++ rtir/branches/1.1/html/RTIR/Search/Results.html Tue Sep 7 01:22:45 2004
@@ -56,6 +56,8 @@
&>
<hr>
+Results!<br>
+
<& Elements/ShowResults,
Query => $Query,
QueryString => $QueryString,
More information about the Rt-commit
mailing list