[Rt-commit] [svn] r1413 - in rtir/branches/1.1/html/RTIR/Search: .
Elements
leira at pallas.eruditorum.org
leira at pallas.eruditorum.org
Fri Sep 3 02:28:18 EDT 2004
Author: leira
Date: Fri Sep 3 02:28:17 2004
New Revision: 1413
Added:
rtir/branches/1.1/html/RTIR/Search/Elements/Refine
Modified:
rtir/branches/1.1/html/RTIR/Search/LinkRefine.html
rtir/branches/1.1/html/RTIR/Search/MergeRefine.html
Log:
Move common elements of Refine pages into a component.
Added: rtir/branches/1.1/html/RTIR/Search/Elements/Refine
==============================================================================
--- (empty file)
+++ rtir/branches/1.1/html/RTIR/Search/Elements/Refine Fri Sep 3 02:28:17 2004
@@ -0,0 +1,145 @@
+%# {{{ 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
+<& /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")
+$ResultPage => '/RTIR/Search/Results.html'
+$BaseURL => 'RTIR/Search/MergeRefine.html'
+$NewQuery => 0
+$Queue => undef
+$Query => undef
+$id => undef
+$FormAction => 'MergeRefine.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/LinkRefine.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/LinkRefine.html (original)
+++ rtir/branches/1.1/html/RTIR/Search/LinkRefine.html Fri Sep 3 02:28:17 2004
@@ -47,9 +47,9 @@
<& '/RTIR/Search/Elements/RefineTabs',
path => $path,
- current_tab => "RTIR/Incident/LinkToIncident.html?id=".$id,
+ current_tab => $current_tab,
current_subtab => $ResultPage."?Queue=$Queue&id=".$id.$QueryString,
- ChildObj => $Ticket,
+ Ticket => $Ticket,
Queue => 'Incidents',
Title => $title,
Format => $Format,
@@ -60,87 +60,7 @@
QueryString => $QueryString,
&>
-<& /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,
- %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>
+<& Elements/Refine, %ARGS &>
<%ARGS>
$title => loc("Query Builder")
@@ -157,4 +77,5 @@
$Page => 1
$OrderBy => 'id'
$Order => 'ASC'
+$current_tab => "RTIR/Incident/LinkToIncident.html?id=".$id
</%ARGS>
Modified: rtir/branches/1.1/html/RTIR/Search/MergeRefine.html
==============================================================================
--- rtir/branches/1.1/html/RTIR/Search/MergeRefine.html (original)
+++ rtir/branches/1.1/html/RTIR/Search/MergeRefine.html Fri Sep 3 02:28:17 2004
@@ -47,6 +47,7 @@
<& '/RTIR/Search/Elements/RefineTabs',
path => $path,
+ current_tab => $current_tab,
current_subtab => $ResultPage."?Queue=$Queue&id=".$id.$QueryString,
Ticket => $Ticket,
Queue => 'Incidents',
@@ -59,88 +60,7 @@
QueryString => $QueryString,
&>
-<& /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>
+<& Elements/Refine, %ARGS &>
<%ARGS>
$title => loc("Query Builder")
@@ -157,4 +77,5 @@
$Page => 1
$OrderBy => 'id'
$Order => 'ASC'
+$current_tab => undef
</%ARGS>
More information about the Rt-commit
mailing list