[Rt-commit] r10690 - in rt/branches/3.999-DANGEROUS: . etc html/Elements html/Elements/CollectionAsTable html/NoAuth/js/libs html/Prefs html/Search html/Search/Elements html/SelfService/Elements html/Ticket/Elements html/Tools/Reports lib/RT/Interface/Web lib/RT/Interface/Web/QueryBuilder lib/RT/Report t/api t/mail t/web
jesse at bestpractical.com
jesse at bestpractical.com
Sun Feb 3 15:58:19 EST 2008
Author: jesse
Date: Sun Feb 3 15:58:17 2008
New Revision: 10690
Removed:
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder.pm
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/etc/initialdata
rt/branches/3.999-DANGEROUS/html/Elements/CollectionAsTable/Header
rt/branches/3.999-DANGEROUS/html/Elements/CollectionList
rt/branches/3.999-DANGEROUS/html/Elements/QueueSummary
rt/branches/3.999-DANGEROUS/html/Elements/ShowSearch
rt/branches/3.999-DANGEROUS/html/Elements/TicketList
rt/branches/3.999-DANGEROUS/html/NoAuth/js/libs/prototype.js
rt/branches/3.999-DANGEROUS/html/Prefs/Search.html
rt/branches/3.999-DANGEROUS/html/Search/Build.html
rt/branches/3.999-DANGEROUS/html/Search/Bulk.html
rt/branches/3.999-DANGEROUS/html/Search/Chart
rt/branches/3.999-DANGEROUS/html/Search/Chart.html
rt/branches/3.999-DANGEROUS/html/Search/Edit.html
rt/branches/3.999-DANGEROUS/html/Search/Elements/Chart
rt/branches/3.999-DANGEROUS/html/Search/Elements/EditSearches
rt/branches/3.999-DANGEROUS/html/Search/Elements/ResultViews
rt/branches/3.999-DANGEROUS/html/Search/Elements/SelectGroupBy
rt/branches/3.999-DANGEROUS/html/Search/Results.html
rt/branches/3.999-DANGEROUS/html/Search/Results.rdf
rt/branches/3.999-DANGEROUS/html/Search/Simple.html
rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests
rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs
rt/branches/3.999-DANGEROUS/html/Tools/Offline.html
rt/branches/3.999-DANGEROUS/html/Tools/Reports/CreatedByDates.html
rt/branches/3.999-DANGEROUS/html/Tools/Reports/ResolvedByDates.html
rt/branches/3.999-DANGEROUS/html/Tools/Reports/ResolvedByOwner.html
rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder/Tree.pm
rt/branches/3.999-DANGEROUS/lib/RT/Report/Tickets.pm
rt/branches/3.999-DANGEROUS/t/api/attribute.t
rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t
rt/branches/3.999-DANGEROUS/t/web/basic.t
rt/branches/3.999-DANGEROUS/t/web/cf_access.t
rt/branches/3.999-DANGEROUS/t/web/custom_frontpage.t
rt/branches/3.999-DANGEROUS/t/web/custom_search.t
rt/branches/3.999-DANGEROUS/t/web/query_builder.t
rt/branches/3.999-DANGEROUS/t/web/rights1.t
Log:
r76138 at pinglin: jesse | 2008-02-03 15:56:17 -0500
* Query -> query
Modified: rt/branches/3.999-DANGEROUS/etc/initialdata
==============================================================================
--- rt/branches/3.999-DANGEROUS/etc/initialdata (original)
+++ rt/branches/3.999-DANGEROUS/etc/initialdata Sun Feb 3 15:58:17 2008
@@ -686,7 +686,7 @@
{ format => q{'<a href="__WebPath__/Ticket/Display.html?id=__id__">__id__</a>/TITLE:#',}
. q{'<a href="__WebPath__/Ticket/Display.html?id=__id__">__subject__</a>/TITLE:subject',}
. q{Priority, Queuename, ExtendedStatus},
- Query => " owner = '__CurrentUser__' AND ( Status = 'new' OR Status = 'open')",
+ query => " owner = '__CurrentUser__' AND ( Status = 'new' OR Status = 'open')",
order_by => 'Priority',
Order => 'DESC'
},
Modified: rt/branches/3.999-DANGEROUS/html/Elements/CollectionAsTable/Header
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/CollectionAsTable/Header (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/CollectionAsTable/Header Sun Feb 3 15:58:17 2008
@@ -52,7 +52,7 @@
$format_string => undef
@order_by => ()
@Order => ()
-$Query => undef
+$query => undef
$Rows => undef
$Page => undef
@@ -60,7 +60,7 @@
$AllowSorting => undef
$baseURL => undef
- at PassArguments => qw(Query format Rows Page Order order_by)
+ at PassArguments => qw(query format rows page Order order_by)
</%ARGS>
<tr class="collection-as-table">
<%PERL>
Modified: rt/branches/3.999-DANGEROUS/html/Elements/CollectionList
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/CollectionList (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/CollectionList Sun Feb 3 15:58:17 2008
@@ -158,7 +158,7 @@
$Title => _('Ticket Search')
$baseURL => RT->config->get('WebPath') . $m->request_comp->path .'?'
- at PassArguments => qw(Query format Rows Page Order order_by)
+ at PassArguments => qw(query format rows page Order order_by)
$AllowSorting => 0
$ShowNavigation => 1
Modified: rt/branches/3.999-DANGEROUS/html/Elements/QueueSummary
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/QueueSummary (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/QueueSummary Sun Feb 3 15:58:17 2008
@@ -58,10 +58,10 @@
% my $queue_cond = "Queue = '$queue->{name}' AND ";
% my $all_q = $queue_cond . "(Status = 'open' OR Status = 'new' OR Status = 'stalled')";
<tr class="<% $i%2 ? 'oddline' : 'evenline'%>" >
-<td><a href="<% RT->config->get('WebPath') %>/Search/Results.html?Query=<% $all_q |u,n %>" title="<% $queue->{description} %>"><% $queue->{name} %></a></td>
+<td><a href="<% RT->config->get('WebPath') %>/Search/Results.html?query=<% $all_q |u,n %>" title="<% $queue->{description} %>"><% $queue->{name} %></a></td>
% for my $condition (@$conditions) {
% $Tickets->from_sql( "Queue = $queue->{id} AND ". $condition->{cond} );
-<td align="right"><a href="<% RT->config->get('WebPath') %>/Search/Results.html?Query=<% $queue_cond.$condition->{cond} |u,n %>"><% $Tickets->count %></a></td>
+<td align="right"><a href="<% RT->config->get('WebPath') %>/Search/Results.html?query=<% $queue_cond.$condition->{cond} |u,n %>"><% $Tickets->count %></a></td>
% }
</tr>
% }
Modified: rt/branches/3.999-DANGEROUS/html/Elements/ShowSearch
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/ShowSearch (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/ShowSearch Sun Feb 3 15:58:17 2008
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
<&|/Widgets/TitleBox,
title => _($search->description, $ProcessedSearchArg->{'Rows'}),
- title_href => $query_link_url.$QueryString,
+ title_href => $query_link_url.$query_string,
titleright => $customize ? _('Edit') : '',
titleright_href => $customize &>
<& $query_display_component, %$ProcessedSearchArg, ShowNavigation => 0 &>
@@ -116,7 +116,7 @@
$_->{'format'} =~ s/__loc\(["']?(\w+)["']?\)__/_("$1")/ge;
}
-my $QueryString = '?' . $m->comp( '/Elements/QueryString', %$SearchArg );
+my $query_string = '?' . $m->comp( '/Elements/QueryString', %$SearchArg );
</%init>
<%ARGS>
Modified: rt/branches/3.999-DANGEROUS/html/Elements/TicketList
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Elements/TicketList (original)
+++ rt/branches/3.999-DANGEROUS/html/Elements/TicketList Sun Feb 3 15:58:17 2008
@@ -53,7 +53,7 @@
format_string => $format,
AllowSorting => $AllowSorting,
Order => $Order,
- Query => $Query,
+ query => $query,
Rows => $Rows,
Page => $Page,
order_by => $order_by ,
@@ -87,7 +87,7 @@
<%perl>
my $prev = $m->comp(
'/Elements/QueryString',
- Query => $Query,
+ query => $query,
format => $format,
Rows => $Rows,
order_by => $order_by,
@@ -96,7 +96,7 @@
);
my $next = $m->comp(
'/Elements/QueryString',
- Query => $Query,
+ query => $query,
format => $format,
Rows => $Rows,
order_by => $order_by,
@@ -114,7 +114,7 @@
<%INIT>
unless ($Collection) {
$Collection = RT::Model::TicketCollection->new();
- $Collection->from_sql( $Query );
+ $Collection->from_sql( $query );
}
my $TotalFound = $Collection->count_all();
@@ -163,7 +163,7 @@
<%ARGS>
$Collection => undef
-$Query => undef
+$query => undef
$format => RT->config->get('DefaultSearchResultFormat')
$display_format => undef
$Order => undef
Modified: rt/branches/3.999-DANGEROUS/html/NoAuth/js/libs/prototype.js
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/NoAuth/js/libs/prototype.js (original)
+++ rt/branches/3.999-DANGEROUS/html/NoAuth/js/libs/prototype.js Sun Feb 3 15:58:17 2008
@@ -681,7 +681,7 @@
};
Object.extend(Hash, {
- toQueryString: function(obj) {
+ toquery_string: function(obj) {
var parts = [];
this.prototype._each.call(obj, function(pair) {
@@ -752,8 +752,8 @@
return result;
},
- toQueryString: function() {
- return Hash.toQueryString(this);
+ toquery_string: function() {
+ return Hash.toquery_string(this);
},
inspect: function() {
@@ -889,7 +889,7 @@
this.method = 'post';
}
- params = Hash.toQueryString(params);
+ params = Hash.toquery_string(params);
if (params && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) params += '&_='
// when GET, append parameters to URL
@@ -1938,7 +1938,7 @@
return result;
});
- return getHash ? data : Hash.toQueryString(data);
+ return getHash ? data : Hash.toquery_string(data);
}
};
@@ -2028,7 +2028,7 @@
if (value != undefined) {
var pair = {};
pair[element.name] = value;
- return Hash.toQueryString(pair);
+ return Hash.toquery_string(pair);
}
}
return '';
Modified: rt/branches/3.999-DANGEROUS/html/Prefs/Search.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Prefs/Search.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Prefs/Search.html Sun Feb 3 15:58:17 2008
@@ -62,7 +62,7 @@
</p>
% }
-<form method="post" action="Search.html" name="BuildQuery">
+<form method="post" action="Search.html" name="build_query">
<input type="hidden" name="name" value="<%$ARGS{name}%>" class="hidden" />
<input type="hidden" name="format" value="<%$ARGS{format}%>" class="hidden" />
Modified: rt/branches/3.999-DANGEROUS/html/Search/Build.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Build.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Build.html Sun Feb 3 15:58:17 2008
@@ -52,7 +52,7 @@
%# one out of the session hash. Also, it could be getting just a raw query from
%# Build/Edit.html (Advanced).)
%#
-%# After doing some stuff with default arguments and saved searches, the ParseQuery
+%# After doing some stuff with default arguments and saved searches, the parse_query
%# function (which is similar to, but not the same as, _parser in RT/Tickets_Overlay_SQL)
%# converts the Query into a RT::Interface::Web::QueryBuilder::Tree. This mason file
%# then adds stuff to or modifies the tree based on the actions that had been requested
@@ -61,21 +61,21 @@
%# box in the top right corner.
%#
%# Worthwhile refactoring: the tree manipulation code for the actions could use some cleaning
-%# up. The node-adding code is different in the "add" actions from in ParseQuery, which leads
-%# to things like ParseQuery correctly not quoting numbers in numerical fields, while the "add"
+%# up. The node-adding code is different in the "add" actions from in parse_query, which leads
+%# to things like parse_query correctly not quoting numbers in numerical fields, while the "add"
%# action does quote it (this breaks SQLite).
%#
<& /Elements/Header, Title => $title &>
<& /Ticket/Elements/Tabs,
- current_tab => "Search/Build.html?".$QueryString,
+ current_tab => "Search/Build.html?".$query_string,
Title => $title,
%query,
SavedSearchId => $saved_search{'id'},
&>
-<form method="post" action="Build.html" name="BuildQuery">
+<form method="post" action="Build.html" name="build_query">
<input type="hidden" class="hidden" name="SavedSearchId" value="<% $saved_search{'id'} %>" />
-<input type="hidden" class="hidden" name="Query" value="<% $query{'Query'} %>" />
+<input type="hidden" class="hidden" name="query" value="<% $query{'query'} %>" />
<input type="hidden" class="hidden" name="format" value="<% $query{'format'} %>" />
@@ -93,7 +93,7 @@
<div id="pick-criteria">
- <& Elements/PickCriteria, query => $query{'Query'}, cfqueues => $queues &>
+ <& Elements/PickCriteria, query => $query{'query'}, cfqueues => $queues &>
</div>
<& /Elements/Submit, Label => _('Add these terms'), name => 'AddClause'&>
@@ -113,20 +113,19 @@
</form>
<%INIT>
-use RT::Interface::Web::QueryBuilder;
use RT::Interface::Web::QueryBuilder::Tree;
my $title = _("Query Builder");
my %query;
-for( qw(Query format order_by Order rows_per_page) ) {
+for( qw(query format order_by Order rows_per_page) ) {
$query{$_} = $ARGS{$_};
}
my %saved_search;
-my @actions = $m->comp( 'Elements/EditSearches:Init', %ARGS, Query => \%query, SavedSearch => \%saved_search);
+my @actions = $m->comp( 'Elements/EditSearches:Init', %ARGS, query => \%query, SavedSearch => \%saved_search);
-if ( $NewQuery ) {
+if ( $new_query ) {
# Wipe all data-carrying variables clear if we want a new
# search, or we're deleting an old one..
@@ -144,9 +143,9 @@
my $current = $session{'CurrentSearchHash'};
my $prefs = Jifty->web->current_user->user_object->preferences("SearchDisplay") || {};
- my $default = { Query => '', format => '', order_by => 'id', Order => 'ASC', rows_per_page => 50 };
+ my $default = {query => '', format => '', order_by => 'id', Order => 'ASC', rows_per_page => 50 };
- for( qw(Query format order_by Order rows_per_page) ) {
+ for( qw(query format order_by Order rows_per_page) ) {
$query{$_} = $current->{$_} unless defined $query{$_};
$query{$_} = $prefs->{$_} unless defined $query{$_};
$query{$_} = $default->{$_} unless defined $query{$_};
@@ -163,7 +162,7 @@
}
}
-my $ParseQuery = sub {
+my $parse_query = sub {
my ($string, $results) = @_;
my $tree = RT::Interface::Web::QueryBuilder::Tree->new('AND');
@@ -172,11 +171,11 @@
return $tree;
};
-my $tree = $ParseQuery->( $query{'Query'}, \@actions );
+my $tree = $parse_query->( $query{'query'}, \@actions );
# if parsing went poorly, send them to the edit page to fix it
if ( $actions[0] ) {
- return $m->comp( "Edit.html", Query => $query{'Query'}, actions => \@actions );
+ return $m->comp( "Edit.html", query => $query{'query'}, actions => \@actions );
}
my @options = $tree->get_displayed_nodes;
@@ -254,7 +253,7 @@
# {{{ Rebuild $Query based on the additions / movements
my $optionlist_arrayref;
-($query{'Query'}, $optionlist_arrayref) = $tree->get_query_and_option_list(\@current_values);
+($query{'query'}, $optionlist_arrayref) = $tree->get_query_and_option_list(\@current_values);
my $optionlist = join "\n", map { qq(<option value="$_->{INDEX}" $_->{SELECTED}>)
. (" " x (5 * $_->{DEPTH}))
@@ -276,7 +275,7 @@
# }}}
# if we're asked to save the current search, save it
-push @actions, $m->comp( 'Elements/EditSearches:Save', %ARGS, Query => \%query, SavedSearch => \%saved_search);
+push @actions, $m->comp( 'Elements/EditSearches:Save', %ARGS, query => \%query, SavedSearch => \%saved_search);
# {{{ Push the updates into the session so we don't loose 'em
@@ -299,14 +298,14 @@
# }}}
-# {{{ Build a querystring for the tabs
+# {{{ Build a query_string for the tabs
-my $QueryString = '';
-if ($NewQuery) {
- $QueryString = 'NewQuery=1';
+my $query_string = '';
+if ($new_query) {
+ $query_string = 'new_query=1';
}
-elsif ( $query{'Query'} ) {
- $QueryString = $m->comp('/Elements/QueryString', %query );
+elsif ( $query{'query'} ) {
+ $query_string = $m->comp('/Elements/QueryString', %query );
}
# }}}
@@ -314,6 +313,6 @@
</%INIT>
<%ARGS>
-$NewQuery => 0
+$new_query => 0
@clauses => ()
</%ARGS>
Modified: rt/branches/3.999-DANGEROUS/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Bulk.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Bulk.html Sun Feb 3 15:58:17 2008
@@ -50,17 +50,17 @@
current_tab => "Search/Bulk.html",
Title => $title,
format => $ARGS{'format'}, # we don't want the locally modified one
- Query => $Query,
+ query => $query,
Rows => $Rows,
order_by => $order_by,
Order => $Order &>
<& /Elements/ListActions, actions => \@results &>
<form method="post" action="<% RT->config->get('WebPath') %>/Search/Bulk.html" enctype="multipart/form-data">
-% foreach my $var qw(Query format order_by Order Rows Page) {
+% foreach my $var qw(query format order_by Order Rows Page) {
<input type="hidden" class="hidden" name="<%$var%>" value="<%$ARGS{$var} || ''%>" />
%}
-<& /Elements/TicketList, Query => $Query,
+<& /Elements/TicketList, query => $query,
display_format => $format,
format => $ARGS{'format'},
Verbatim => 1,
@@ -214,7 +214,7 @@
$format =~ s/'?([^']+)'?,/'___CHECKBOX__$1',/;
my $Tickets = RT::Model::TicketCollection->new();
-$Tickets->from_sql($Query);
+$Tickets->from_sql($query);
if ( $order_by =~ /\|/ ) {
# Multiple Sorts
@@ -374,5 +374,5 @@
$Rows => 50
$Order => 'ASC'
$order_by => 'id'
-$Query => undef
+$query => undef
</%args>
Modified: rt/branches/3.999-DANGEROUS/html/Search/Chart
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Chart (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Chart Sun Feb 3 15:58:17 2008
@@ -46,7 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<%args>
-$Query => "id > 0"
+$query => "id > 0"
$PrimaryGroupBy => 'queue'
$SecondaryGroupBy => undef
$ChartStyle => 'bars'
@@ -68,7 +68,7 @@
use RT::Report::Tickets;
my $tix = RT::Report::Tickets->new();
-$tix->from_sql( $Query );
+$tix->from_sql( $query );
my $count_name = $tix->column( FUNCTION => 'COUNT', column => 'id' );
$tix->group_by( column => $PrimaryGroupBy );
my $value_name = $tix->column( column => $PrimaryGroupBy );
Modified: rt/branches/3.999-DANGEROUS/html/Search/Chart.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Chart.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Chart.html Sun Feb 3 15:58:17 2008
@@ -46,7 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<%args>
-$Query => "id > 0"
+$query => "id > 0"
$PrimaryGroupBy => 'queue'
$SecondaryGroupBy => ''
$ChartStyle => 'bars'
@@ -59,7 +59,7 @@
my $saved_search = $m->comp( '/Widgets/SavedSearch:new',
SearchType => 'Chart',
- SearchFields => [qw(Query PrimaryGroupBy SecondaryGroupBy ChartStyle)] );
+ SearchFields => [qw(query PrimaryGroupBy SecondaryGroupBy ChartStyle)] );
my @actions = $m->comp( '/Widgets/SavedSearch:process', args => \%ARGS, self => $saved_search );
Modified: rt/branches/3.999-DANGEROUS/html/Search/Edit.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Edit.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Edit.html Sun Feb 3 15:58:17 2008
@@ -47,10 +47,10 @@
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header, Title => $title&>
<& /Ticket/Elements/Tabs,
- current_tab => "Search/Edit.html?".$QueryString,
+ current_tab => "Search/Edit.html?".$query_string,
Title => $title,
format => $format,
- Query => $Query,
+ query => $query,
Rows => $Rows,
order_by => $order_by,
Order => $Order,
@@ -61,7 +61,7 @@
<form method="post" action="Build.html">
<input type="hidden" class="hidden" name="SavedSearchId" value="<% $SavedSearchId %>" />
-<textarea name="Query" rows="8" cols="72"><% $Query %></textarea>
+<textarea name="query" rows="8" cols="72"><% $query %></textarea>
<br />
<textarea name="format" rows="8" cols="72"><% $format %></textarea>
<br />
@@ -71,8 +71,8 @@
<%INIT>
my $title = _("Edit Query");
$format = $m->comp('/Elements/ScrubHTML', content => $format);
-my $QueryString = $m->comp('/Elements/QueryString',
- Query => $Query,
+my $query_string = $m->comp('/Elements/QueryString',
+ query => $query,
format => $format,
Rows => $Rows,
order_by => $order_by,
@@ -85,7 +85,7 @@
<%ARGS>
$SavedSearchId => 'new'
-$Query => ''
+$query => ''
$format => ''
$Rows => '50'
$order_by => 'id'
Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/Chart
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/Chart (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/Chart Sun Feb 3 15:58:17 2008
@@ -46,7 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<%args>
-$Query => "id > 0"
+$query => "id > 0"
$PrimaryGroupBy => 'queue'
$SecondaryGroupBy => undef
$ChartStyle => 'bars'
@@ -54,7 +54,7 @@
<%init>
use RT::Report::Tickets;
my $tix = RT::Report::Tickets->new();
-$tix->from_sql( $Query );
+$tix->from_sql( $query );
my $count_name = $tix->column( function => 'COUNT', column => 'id' );
$tix->group_by( column => $PrimaryGroupBy );
my $value_name = $tix->column( column => $PrimaryGroupBy );
@@ -100,7 +100,7 @@
my $query_string = $m->comp('/Elements/QueryString', %ARGS);
</%init>
-<% _('Query:') %> <% $Query %><br />
+<% _('Query:') %> <% $query %><br />
<img src="<%RT->config->get('WebPath')%>/Search/Chart?<%$query_string|n%>" /><br />
Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/EditSearches
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/EditSearches (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/EditSearches Sun Feb 3 15:58:17 2008
@@ -114,12 +114,12 @@
<%METHOD Init>
<%ARGS>
-$Query => {}
+$query => {}
$SavedSearch => {}
</%ARGS>
<%INIT>
-my @columns = qw(Query format order_by Order rows_per_page);
+my @columns = qw(query format order_by Order rows_per_page);
$SavedSearch->{'id'} = $ARGS{'SavedSearchId'} || 'new';
$SavedSearch->{'description'} = $ARGS{'SavedSearchdescription'} || '';
@@ -135,7 +135,7 @@
$SavedSearch->{'id'} = $ARGS{'SavedSearchLoad'};
$SavedSearch->{'object'} = $search;
$SavedSearch->{'description'} = $search->description;
- $Query->{$_} = $search->sub_value($_) foreach @columns;
+ $query->{$_} = $search->sub_value($_) foreach @columns;
}
elsif ( $ARGS{'SavedSearchDelete'} ) {
# We set $SearchId to 'new' above already, so peek into the %ARGS
@@ -166,7 +166,7 @@
<%METHOD Save>
<%ARGS>
-$Query => {}
+$query => {}
$SavedSearch => {}
</%ARGS>
<%INIT>
@@ -187,7 +187,7 @@
}
}
- $obj->set_sub_values( %$Query );
+ $obj->set_sub_values( %$query );
$obj->set_description( $desc );
}
elsif ( $id eq 'new' ) {
@@ -195,7 +195,7 @@
my ($status, $msg) = $saved_search->save(
privacy => $ARGS{'SavedSearchOwner'},
name => $desc,
- search_params => $Query,
+ search_params => $query,
);
if ( $status ) {
@@ -223,7 +223,7 @@
<%METHOD IsDirty>
<%ARGS>
-$Query => {}
+$query => {}
$SavedSearch => {}
</%ARGS>
<%INIT>
@@ -231,8 +231,8 @@
my $obj = $SavedSearch->{'object'};
return 0 unless $obj && $obj->id;
-foreach( qw(Query format order_by order rows_per_page) ) {
- return 1 if $obj->sub_value( $_ ) ne $Query->{$_};
+foreach( qw(query format order_by order rows_per_page) ) {
+ return 1 if $obj->sub_value( $_ ) ne $query->{$_};
}
return 0;
Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/ResultViews
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/ResultViews (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/ResultViews Sun Feb 3 15:58:17 2008
@@ -46,28 +46,28 @@
%#
%# END BPS TAGGED BLOCK }}}
<%args>
-$QueryString => undef
-$Query => undef
+$query_string => undef
+$query => undef
$format => undef
$Rows => undef
$order_by => undef
$Order => undef
$RSSFeedURL => undef
-$ShortQueryString => undef
+$Shortquery_string => undef
</%args>
-<a href="<%RT->config->get('WebPath')%>/Search/Bulk.html<%$QueryString%>"><&|/l&>update multiple tickets</&></a><br />
-<a href="<%RT->config->get('WebPath')%>/Search/Results.html<%$QueryString%>"><&|/l&>Bookmarkable link</&></a><br />
-<a href="<%RT->config->get('WebPath')%>/Search/Results.tsv<%$QueryString%>"><&|/l&>spreadsheet</&></a> |
+<a href="<%RT->config->get('WebPath')%>/Search/Bulk.html<%$query_string%>"><&|/l&>update multiple tickets</&></a><br />
+<a href="<%RT->config->get('WebPath')%>/Search/Results.html<%$query_string%>"><&|/l&>Bookmarkable link</&></a><br />
+<a href="<%RT->config->get('WebPath')%>/Search/Results.tsv<%$query_string%>"><&|/l&>spreadsheet</&></a> |
<a href="<%$RSSFeedURL%>"><&|/l&>RSS</&></a> |
-<a href="<%RT->config->get('WebPath')%>/Tools/Offline.html<%$ShortQueryString%>"><&|/l&>Work offline</&></a><br />
+<a href="<%RT->config->get('WebPath')%>/Tools/Offline.html<%$Shortquery_string%>"><&|/l&>Work offline</&></a><br />
<form method="get" action="<%RT->config->get('WebPath')%>/Search/Chart.html"><&|/l&>chart</&>
-% my %hiddens = (Query => $Query, format => $format, Rows => $Rows, order_by => $order_by, Order => $Order);
+% my %hiddens = (query => $query, format => $format, Rows => $Rows, order_by => $order_by, Order => $Order);
% foreach my $key (keys(%hiddens)) {
<input type="hidden" class="hidden" name="<%$key%>" value="<%defined($hiddens{$key})?$hiddens{$key}:''%>" />
% }
-<&|/l, $m->scomp('SelectGroupBy', name => 'PrimaryGroupBy', Query => $Query) &>grouped by %1</&>
+<&|/l, $m->scomp('SelectGroupBy', name => 'PrimaryGroupBy', query => $query) &>grouped by %1</&>
<&|/l, $m->scomp('SelectChartType', name => 'ChartStyle') &>style: %1</&>
<input type="submit" class="button" value="<%_('Go')%>" />
</form>
@@ -77,7 +77,7 @@
my $query_string = $m->comp('/Elements/QueryString',
Search => 1,
Plugin => 'Tickets',
- 'Tickets:query' => $Query,
+ 'Tickets:query' => $query,
'Tickets:limit' => $Rows || '',
);
</%PERL>
Modified: rt/branches/3.999-DANGEROUS/html/Search/Elements/SelectGroupBy
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Elements/SelectGroupBy (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Elements/SelectGroupBy Sun Feb 3 15:58:17 2008
@@ -48,7 +48,7 @@
<%args>
$name => 'GroupBy'
$Default => 'Status'
-$Query => ''
+$query => ''
</%args>
<select name="<% $name %>">
% while (@options) {
@@ -59,5 +59,5 @@
<%init>
use RT::Report::Tickets;
my $report = RT::Report::Tickets->new();
-my @options = $report->groupings( Query => $Query );
+my @options = $report->groupings( query => $query );
</%init>
Modified: rt/branches/3.999-DANGEROUS/html/Search/Results.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Results.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Results.html Sun Feb 3 15:58:17 2008
@@ -48,15 +48,15 @@
<& /Elements/Header, Title => $title, Refresh => $session{'tickets_refresh_interval'},
RSSAutoDiscovery => $RSSFeedURL &>
<& /Ticket/Elements/Tabs,
- current_tab => "Search/Results.html".$QueryString,
+ current_tab => "Search/Results.html".$query_string,
Title => $title,
format => $format,
- Query => $Query,
+ query => $query,
Rows => $Rows,
order_by => $order_by,
Order => $Order &>
<& /Elements/TicketList,
- Query => $Query,
+ query => $query,
AllowSorting => 1,
order_by => $order_by,
Order => $Order,
@@ -66,7 +66,7 @@
baseURL => RT->config->get('WebPath')."/Search/Results.html?"
&>
-% my %hiddens = (Query => $Query, format => $format, Rows => $Rows, order_by => $order_by, Order => $Order, HideResults => $HideResults, Page => $Page );
+% my %hiddens = (query => $query, format => $format, Rows => $Rows, order_by => $order_by, Order => $Order, HideResults => $HideResults, Page => $Page );
<div align="right">
<form method="get" action="<%RT->config->get('WebPath')%>/Search/Results.html">
% foreach my $key (keys(%hiddens)) {
@@ -78,16 +78,16 @@
</div>
<div align="right">
<& Elements/ResultViews,
- QueryString => $QueryString,
- Query => $Query,
+ query_string => $query_string,
+ query => $query,
format => $format,
Rows => $Rows,
order_by => $order_by,
Order => $Order,
RSSFeedURL => $RSSFeedURL,
- ShortQueryString => $ShortQueryString,
+ short_querystring => $short_querystring,
&>
-% $m->callback( QueryString => $QueryString, Callbackname => 'SearchActions' );
+% $m->callback( query_string => $query_string, Callbackname => 'SearchActions' );
</div>
<%INIT>
# Read from user preferences
@@ -115,7 +115,7 @@
my ($title, $ticketcount);
$session{'i'}++;
$session{'tickets'} = RT::Model::TicketCollection->new() ;
-$session{'tickets'}->from_sql($Query) if ($Query);
+$session{'tickets'}->from_sql($query) if ($query);
if ($order_by =~ /\|/) {
# Multiple Sorts
@@ -130,7 +130,7 @@
$session{'CurrentSearchHash'} = {
format => $format,
- Query => $Query,
+ query => $query,
Page => $Page,
Order => $Order,
order_by => $order_by,
@@ -145,15 +145,15 @@
$title = _("Find tickets");
}
-my $QueryString = "?".$m->comp('/Elements/QueryString',
- Query => $Query,
+my $query_string = "?".$m->comp('/Elements/QueryString',
+ query => $query,
format => $format,
Rows => $Rows,
order_by => $order_by,
Order => $Order,
Page => $Page);
-my $ShortQueryString = "?".$m->comp('/Elements/QueryString', Query => $Query);
-my $RSSFeedURL = RT->config->get('WebPath')."/Search/Results.rdf$ShortQueryString";
+my $short_querystring = "?".$m->comp('/Elements/QueryString', query => $query);
+my $RSSFeedURL = RT->config->get('WebPath')."/Search/Results.rdf$short_querystring";
if ($ARGS{'TicketsRefreshInterval'}) {
$session{'tickets_refresh_interval'} = $ARGS{'TicketsRefreshInterval'};
@@ -163,7 +163,7 @@
$session{'tickets'}->prep_for_serialization();
</%CLEANUP>
<%ARGS>
-$Query => undef
+$query => undef
$format => undef
$HideResults => 0
$Rows => undef
Modified: rt/branches/3.999-DANGEROUS/html/Search/Results.rdf
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Results.rdf (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Results.rdf Sun Feb 3 15:58:17 2008
@@ -48,7 +48,7 @@
<%INIT>
my $Tickets = RT::Model::TicketCollection->new();
-$Tickets->from_sql($ARGS{'Query'});
+$Tickets->from_sql($ARGS{'query'});
$r->content_type('application/rss+xml');
Modified: rt/branches/3.999-DANGEROUS/html/Search/Simple.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Search/Simple.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Search/Simple.html Sun Feb 3 15:58:17 2008
@@ -98,7 +98,7 @@
my $search = RT::Search::Googleish->new(%args);
- $m->comp( "Results.html", Query => $search->query_to_sql() );
+ $m->comp( "Results.html", query => $search->query_to_sql() );
$m->comp( "/Elements/Footer" );
$m->abort();
}
Modified: rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests (original)
+++ rt/branches/3.999-DANGEROUS/html/SelfService/Elements/MyRequests Sun Feb 3 15:58:17 2008
@@ -48,7 +48,7 @@
<&| /Widgets/TitleBox, title => $title &>
<& /Elements/TicketList, Title => $title,
format => @format,
- Query => $Query,
+ query => $query,
Order => $Order,
order_by => $order_by,
baseURL => $baseURL,
@@ -57,11 +57,11 @@
<%INIT>
my $id = Jifty->web->current_user->id;
-my $Query = "( "
+my $query = "( "
. join( ' OR ', map "$_.id = $id", @roles )
. ")";
if ( @status ) {
- $Query .= " AND ( "
+ $query .= " AND ( "
. join( ' OR ', map "Status = '$_'", @status )
. " )";
}
Modified: rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs (original)
+++ rt/branches/3.999-DANGEROUS/html/Ticket/Elements/Tabs Sun Feb 3 15:58:17 2008
@@ -201,16 +201,16 @@
$args= "?" . $m->comp(
'/Elements/QueryString',
SavedSearchId => $ARGS{'SavedSearchId'} || $session{'CurrentSearchHash'}->{'SearchId'},
- Query => $ARGS{'Query'} || $session{'CurrentSearchHash'}->{'Query'},
+ query => $ARGS{'query'} || $session{'CurrentSearchHash'}->{'query'},
format => $ARGS{'format'} || $session{'CurrentSearchHash'}->{'format'},
order_by => $ARGS{'order_by'} || $session{'CurrentSearchHash'}->{'order_by'},
Order => $ARGS{'Order'} || $session{'CurrentSearchHash'}->{'Order'},
Page => $ARGS{'Page'} || $session{'CurrentSearchHash'}->{'Page'},
Rows => $ARGS{'Rows'},
- ) if ($ARGS{'Query'} or $session{'CurrentSearchHash'}->{'Query'});
+ ) if ($ARGS{'query'} or $session{'CurrentSearchHash'}->{'query'});
$args ||= '';
-$tabs->{"f"} = { path => "Search/Build.html?NewQuery=1",
+$tabs->{"f"} = { path => "Search/Build.html?new_query=1",
title => _('New Search')};
$tabs->{"g"} = { path => "Search/Build.html$args",
title => _('Edit Search')};
Modified: rt/branches/3.999-DANGEROUS/html/Tools/Offline.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Tools/Offline.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Tools/Offline.html Sun Feb 3 15:58:17 2008
@@ -136,9 +136,9 @@
push @results, $action->create_by_template();
push @results, $action->update_by_template();
} else {
- if ($ARGS{'Query'}) {
+ if ($ARGS{'query'}) {
my $Tickets = RT::Model::TicketCollection->new();
- $Tickets->from_sql($ARGS{'Query'});
+ $Tickets->from_sql($ARGS{'query'});
while (my $t = $Tickets->next) {
$string .= "===Update-Ticket: " . $t->id . "\n";
Modified: rt/branches/3.999-DANGEROUS/html/Tools/Reports/CreatedByDates.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Tools/Reports/CreatedByDates.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Tools/Reports/CreatedByDates.html Sun Feb 3 15:58:17 2008
@@ -79,7 +79,7 @@
% if ($CreatedBefore) { $query .= " AND Created < '".$before->iso."'"; }
% if ($CreatedAfter) { $query .= " AND Created > '".$after->iso."'"}
% my $groupby = 'Status';
-<& /Search/Elements/Chart, Query => $query, PrimaryGroupBy => $groupby &>
+<& /Search/Elements/Chart, query => $query, PrimaryGroupBy => $groupby &>
% }
<hr>
Modified: rt/branches/3.999-DANGEROUS/html/Tools/Reports/ResolvedByDates.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Tools/Reports/ResolvedByDates.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Tools/Reports/ResolvedByDates.html Sun Feb 3 15:58:17 2008
@@ -80,7 +80,7 @@
% if ($ResolvedBefore) { $query .= " AND resolved < '".$before->iso."'"; }
% if ($ResolvedAfter) { $query .= " AND resolved > '".$after->iso."'"}
% my $groupby = 'Owner';
-<& /Search/Elements/Chart, Query => $query, PrimaryGroupBy => $groupby &>
+<& /Search/Elements/Chart, query => $query, PrimaryGroupBy => $groupby &>
% }
<hr>
Modified: rt/branches/3.999-DANGEROUS/html/Tools/Reports/ResolvedByOwner.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/html/Tools/Reports/ResolvedByOwner.html (original)
+++ rt/branches/3.999-DANGEROUS/html/Tools/Reports/ResolvedByOwner.html Sun Feb 3 15:58:17 2008
@@ -60,7 +60,7 @@
% # if we have a queue, do the search
% my $query = "Status = 'resolved' AND queue = '$queue'";
% my $groupby = 'Owner';
-<& /Search/Elements/Chart, Query => $query, PrimaryGroupBy => $groupby &>
+<& /Search/Elements/Chart, query => $query, PrimaryGroupBy => $groupby &>
% }
<hr>
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder/Tree.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder/Tree.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Interface/Web/QueryBuilder/Tree.pm Sun Feb 3 15:58:17 2008
@@ -280,14 +280,4 @@
RT::SQL::parse( $string, \%callback );
return @results;
}
-
-eval "require RT::Interface::Web::QueryBuilder::Tree_Vendor";
-die $@
- if ( $@
- && $@ !~ qr{^Can't locate RT/Interface/Web/QueryBuilder/Tree_Vendor.pm} );
-eval "require RT::Interface::Web::QueryBuilder::Tree_Local";
-die $@
- if ( $@
- && $@ !~ qr{^Can't locate RT/Interface/Web/QueryBuilder/Tree_Local.pm} );
-
1;
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Report/Tickets.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Report/Tickets.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Report/Tickets.pm Sun Feb 3 15:58:17 2008
@@ -83,10 +83,10 @@
@fields = map { $_, $_ } @fields;
my $queues = $args{'Queues'};
- if ( !$queues && $args{'Query'} ) {
+ if ( !$queues && $args{'query'} ) {
require RT::Interface::Web::QueryBuilder::Tree;
my $tree = RT::Interface::Web::QueryBuilder::Tree->new('AND');
- $tree->parse_sql( Query => $args{'Query'} );
+ $tree->parse_sql( query => $args{'query'} );
$queues = $tree->get_referenced_queues;
}
Modified: rt/branches/3.999-DANGEROUS/t/api/attribute.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/api/attribute.t (original)
+++ rt/branches/3.999-DANGEROUS/t/api/attribute.t Sun Feb 3 15:58:17 2008
@@ -7,7 +7,7 @@
my $user = RT->system_user;
-my ($id, $msg) = $user->user_object->add_attribute(name => 'SavedSearch', content => { Query => 'Foo'} );
+my ($id, $msg) = $user->user_object->add_attribute(name => 'SavedSearch', content => { query => 'Foo'} );
ok ($id, $msg);
my $attr = RT::Model::Attribute->new(current_user => RT->system_user);
$attr->load($id);
Modified: rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t (original)
+++ rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t Sun Feb 3 15:58:17 2008
@@ -73,7 +73,6 @@
ok( $res{'exit_code'}, "couldn't sign without passphrase");
ok( $res{'error'}, "error is here" );
ok( $res{'logger'}, "log is here as well" );
-
my @status = RT::Crypt::GnuPG::parse_status( $res{'status'} );
is( scalar @status, 1, 'one record');
is( $status[0]->{'operation'}, 'passphrase_check', 'operation is correct');
Modified: rt/branches/3.999-DANGEROUS/t/web/basic.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/basic.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/basic.t Sun Feb 3 15:58:17 2008
@@ -72,7 +72,7 @@
}
# }}}
-# {{{ Query Builder tests
+# {{{ query Builder tests
#
# XXX: hey-ho, we have these tests in t/web/query-builder
# TODO: move everything about QB there
@@ -85,22 +85,22 @@
# Adding items
# set the first value
-ok($agent->form_name('BuildQuery'));
+ok($agent->form_name('build_query'));
$agent->field("attachment_field", "subject");
$agent->field("attachment_op", "LIKE");
$agent->field("value_of_attachment", "aaa");
$agent->submit("AddClause");
# set the next value
-ok($agent->form_name('BuildQuery'));
+ok($agent->form_name('build_query'));
$agent->field("attachment_field", "subject");
$agent->field("attachment_op", "LIKE");
$agent->field("value_of_attachment", "bbb");
$agent->submit("AddClause");
-ok($agent->form_name('BuildQuery'));
+ok($agent->form_name('build_query'));
# get the query
-my $query = $agent->current_form->find_input("Query")->value;
+my $query = $agent->current_form->find_input("query")->value;
# strip whitespace from ends
$query =~ s/^\s*//g;
$query =~ s/\s*$//g;
Modified: rt/branches/3.999-DANGEROUS/t/web/cf_access.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/cf_access.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/cf_access.t Sun Feb 3 15:58:17 2008
@@ -165,7 +165,7 @@
$m->title_is(q/Query Builder/, 'Query building');
$m->submit_form(
- form_name => "BuildQuery",
+ form_name => "build_query",
fields => {
id_op => '=',
value_of_id => $tid,
@@ -174,14 +174,14 @@
button => 'AddClause',
);
-$m->form_name('BuildQuery');
+$m->form_name('build_query');
my $col = ($m->current_form->find_input('SelectDisplayColumns'))[-1];
$col->value( ($col->possible_values)[-1] );
$m->click('AddCol');
-$m->form_name('BuildQuery');
+$m->form_name('build_query');
$m->click('DoSearch');
$m->follow_link( text_regex => qr/bplogo\.gif/ );
Modified: rt/branches/3.999-DANGEROUS/t/web/custom_frontpage.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/custom_frontpage.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/custom_frontpage.t Sun Feb 3 15:58:17 2008
@@ -23,7 +23,7 @@
$m->get ( $url."Search/Build.html");
#create a saved search
-$m->form_name ('BuildQuery');
+$m->form_name ('build_query');
$m->field ( "value_of_attachment" => 'stupid');
$m->field ( "SavedSearchdescription" => 'stupid tickets');
Modified: rt/branches/3.999-DANGEROUS/t/web/custom_search.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/custom_search.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/custom_search.t Sun Feb 3 15:58:17 2008
@@ -11,10 +11,10 @@
my $t = RT::Model::Ticket->new(current_user => RT->system_user);
-$t->create(subject => 'for custom search'.$$, queue => 'general',
- Owner => 'root', Requestor => 'customsearch at localhost');
+my ($tkid,$txnid, $msg) = $t->create(subject => 'for custom search'.$$, queue => 'general',
+ owner => 'root', requestor => 'customsearch at localhost');
ok(my $id = $t->id, 'Created ticket for custom search');
-
+ok($tkid, $msg);
ok $m->login, 'logged in';
my $t_link = $m->find_link( text => "for custom search".$$ );
like ($t_link->url, qr/$id/, 'link to the ticket we Created');
@@ -27,12 +27,12 @@
$m->content_like (qr'highest priority tickets');
# add Requestor to the fields
-$m->form_name ('BuildQuery');
+$m->form_name ('build_query');
# can't use submit form for mutli-valued select as it uses set_fields
$m->field (SelectDisplayColumns => ['Requestors']);
$m->click_button (name => 'AddCol') ;
-$m->form_name ('BuildQuery');
+$m->form_name ('build_query');
$m->click_button (name => 'Save');
$m->get( $url );
@@ -42,11 +42,11 @@
# now remove Requestor from the fields
$m->get ($cus_hp);
-$m->form_name ('BuildQuery');
+$m->form_name ('build_query');
$m->field (CurrentDisplayColumns => 'Requestors');
$m->click_button (name => 'RemoveCol') ;
-$m->form_name ('BuildQuery');
+$m->form_name ('build_query');
$m->click_button (name => 'Save');
$m->get( $url );
Modified: rt/branches/3.999-DANGEROUS/t/web/query_builder.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/query_builder.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/query_builder.t Sun Feb 3 15:58:17 2008
@@ -29,9 +29,9 @@
ok $response->is_success, "Fetched ". $url ."Search/Build.html";
sub get_query_from_form {
- $agent->form_name('BuildQuery');
+ $agent->form_name('build_query');
# This pulls out the "hidden input" query from the page
- my $q = $agent->current_form->find_input("Query")->value;
+ my $q = $agent->current_form->find_input("query")->value;
$q =~ s/^\s+//g;
$q =~ s/\s+$//g;
$q =~ s/\s+/ /g;
@@ -46,7 +46,7 @@
diag "add the first condition" if $ENV{'TEST_VERBOSE'};
{
- ok $agent->form_name('BuildQuery'), "found the form once";
+ ok $agent->form_name('build_query'), "found the form once";
$agent->field("actor_field", "owner");
$agent->field("actor_op", "=");
$agent->field("value_of_actor", 'Nobody');
@@ -56,7 +56,7 @@
diag "set the next condition" if $ENV{'TEST_VERBOSE'};
{
- ok($agent->form_name('BuildQuery'), "found the form again");
+ ok($agent->form_name('build_query'), "found the form again");
$agent->field("queue_op", "!=");
$agent->field("value_of_queue", "Regression");
$agent->submit;
@@ -68,7 +68,7 @@
{
$agent->select("clauses", ["0"] );
$agent->click("DeleteClause");
- ok $agent->form_name('BuildQuery'), "found the form";
+ ok $agent->form_name('build_query'), "found the form";
is get_query_from_form, "queue != 'Regression'", 'correct query';
}
@@ -78,7 +78,7 @@
$agent->select("id_op", ">");
$agent->field("value_of_id" => "1234");
$agent->click("AddClause");
- ok $agent->form_name('BuildQuery'), "found the form again";
+ ok $agent->form_name('build_query'), "found the form again";
is get_query_from_form, "queue != 'Regression' OR id > 1234",
"added something as OR, and number not quoted";
is_deeply selected_clauses, ["1"], 'the id that we just entered is still selected';
@@ -88,7 +88,7 @@
diag "Move the second one up a level" if $ENV{'TEST_VERBOSE'};
{
$agent->click("Up");
- ok $agent->form_name('BuildQuery'), "found the form again";
+ ok $agent->form_name('build_query'), "found the form again";
is get_query_from_form, "id > 1234 OR queue != 'Regression'", "moved up one";
is_deeply selected_clauses, ["0"], 'the one we moved up is selected';
}
@@ -96,7 +96,7 @@
diag "Move the second one right" if $ENV{'TEST_VERBOSE'};
{
$agent->click("Right");
- ok $agent->form_name('BuildQuery'), "found the form again";
+ ok $agent->form_name('build_query'), "found the form again";
is get_query_from_form, "queue != 'Regression' OR ( id > 1234 )",
"moved over to the right (and down)";
is_deeply selected_clauses, ["2"], 'the one we moved right is selected';
@@ -106,7 +106,7 @@
{
$agent->select("clauses", ["1"]);
$agent->click("Up");
- ok $agent->form_name('BuildQuery'), "found the form again";
+ ok $agent->form_name('build_query'), "found the form again";
is get_query_from_form, "( id > 1234 ) OR queue != 'Regression'", "moved up";
is_deeply selected_clauses, ["0"], 'the one we moved up is selected';
}
@@ -116,7 +116,7 @@
{
$agent->select("clauses", ["0"]);
$agent->click("Up");
- ok $agent->form_name('BuildQuery'), "found the form again";
+ ok $agent->form_name('build_query'), "found the form again";
$agent->content_like(qr/error: can\S+t move up/, "i shouldn't have been able to hit up");
is_deeply selected_clauses, ["0"], 'the one we tried to move is selected';
}
@@ -124,7 +124,7 @@
diag "Can not move left the left most clause" if $ENV{'TEST_VERBOSE'};
{
$agent->click("Left");
- ok($agent->form_name('BuildQuery'), "found the form again");
+ ok($agent->form_name('build_query'), "found the form again");
$agent->content_like(qr/error: can\S+t move left/, "i shouldn't have been able to hit left");
is_deeply selected_clauses, ["0"], 'the one we tried to move is selected';
}
@@ -134,7 +134,7 @@
$agent->select("clauses", ["1"]);
$agent->select("value_of_status" => "stalled");
$agent->submit;
- ok $agent->form_name('BuildQuery'), "found the form again";
+ ok $agent->form_name('build_query'), "found the form again";
is_deeply selected_clauses, ["2"], 'the one we added is only selected';
is get_query_from_form,
"( id > 1234 AND status = 'stalled' ) OR queue != 'Regression'",
@@ -147,7 +147,7 @@
my $response = $agent->get($url."Search/Edit.html");
ok( $response->is_success, "Fetched /Search/Edit.html" );
ok($agent->form_number(3), "found the form");
- $agent->field("Query", "Status = 'new' OR ( Status = 'open' AND subject LIKE 'office' )");
+ $agent->field("query", "Status = 'new' OR ( Status = 'open' AND subject LIKE 'office' )");
$agent->submit;
is( get_query_from_form,
"status = 'new' OR ( status = 'open' AND subject LIKE 'office' )",
@@ -214,10 +214,10 @@
);
ok($return, 'Created CF') or diag "error: $msg";
}
- my $response = $agent->get($url."Search/Build.html?NewQuery=1");
+ my $response = $agent->get($url."Search/Build.html?new_query=1");
ok( $response->is_success, "Fetched " . $url."Search/Build.html" );
- ok($agent->form_name('BuildQuery'), "found the form once");
+ ok($agent->form_name('build_query'), "found the form once");
print ($agent->content());
#$agent->field("ValueOf'CF.{\321\202}'", "\321\201");
$agent->submit();
@@ -235,7 +235,7 @@
my $response = $agent->get( $url."Search/Edit.html" );
ok $response->is_success, "Fetched /Search/Edit.html";
ok $agent->form_number(3), "found the form";
- $agent->field("Query", "( Status = 'new' OR Status = 'open' )");
+ $agent->field("query", "( Status = 'new' OR Status = 'open' )");
$agent->submit;
is( get_query_from_form,
"( status = 'new' OR status = 'open' )",
Modified: rt/branches/3.999-DANGEROUS/t/web/rights1.t
==============================================================================
--- rt/branches/3.999-DANGEROUS/t/web/rights1.t (original)
+++ rt/branches/3.999-DANGEROUS/t/web/rights1.t Sun Feb 3 15:58:17 2008
@@ -105,7 +105,7 @@
# ourself in the list of possible owners.
$agent->reload();
-ok($agent->form_name('BuildQuery'), "Yep, form is still there");
+ok($agent->form_name('build_query'), "Yep, form is still there");
my $input = $agent->current_form->find_input('value_of_actor');
ok(grep(/customer-$$/, $input->value_names()), "Found self in the actor listing");
More information about the Rt-commit
mailing list