[Bps-public-commit] r10970 - in RT-Extension-Reports/html/Reports: Elements

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Sun Mar  2 04:15:29 2008
New Revision: 10970

Added:
   RT-Extension-Reports/html/Reports/Elements/
   RT-Extension-Reports/html/Reports/Elements/EditFilter
Modified:
   RT-Extension-Reports/html/Reports/Types/TicketsNumber

Log:
added EditFilter element

Added: RT-Extension-Reports/html/Reports/Elements/EditFilter
==============================================================================
--- (empty file)
+++ RT-Extension-Reports/html/Reports/Elements/EditFilter	Sun Mar  2 04:15:29 2008
@@ -0,0 +1,61 @@
+%# BEGIN BPS TAGGED BLOCK {{{
+%# 
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2007 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., 51 Franklin Street, Fifth Floor, Boston, MA
+%# 02110-1301 or visit their web page on the internet at
+%# http://www.gnu.org/copyleft/gpl.html.
+%# 
+%# 
+%# 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 }}}
+
+<textarea name="<% $Name %>" cols="<% $Cols %>" rows="<% $Rows %>"><% $Content %></textarea>
+
+
+<%INIT>
+
+</%INIT>
+
+<%ARGS>
+$Name => 'Filter'
+$Rows => 5
+$Cols => 30
+$Content => undef
+</%ARGS>

Modified: RT-Extension-Reports/html/Reports/Types/TicketsNumber
==============================================================================
--- RT-Extension-Reports/html/Reports/Types/TicketsNumber	(original)
+++ RT-Extension-Reports/html/Reports/Types/TicketsNumber	Sun Mar  2 04:15:29 2008
@@ -63,7 +63,7 @@
 </tr>
 <tr>
 <td><&|/l&>Filter</&></td>
-<td><textarea name="Filter" cols="30" rows="5"><% $Filter %></textarea>
+<td><& /Reports/Elements/EditFilter, Content => $Filter, Name => 'Filter' &></td>
 </tr>
 <tr><td /><td>
 <input type="hidden" name="Run" value=1>
@@ -109,9 +109,6 @@
     $end_date->AddDay; # we want the date ranage to be inclusive
     my $tickets = RT::Tickets->new( $session{CurrentUser} );
 
-    $tickets->FromSQL( q{ Created >= '} . $start_date->ISO . q{ ' AND
-Created < '} . $end_date->ISO . q{'} );
-
     my $tmp_date = RT::Date->new( $session{CurrentUser} );
     $tmp_date->Set( Value => $start_date->Unix );
     while ( $tmp_date->Unix < $end_date->Unix ) {
@@ -119,6 +116,9 @@
         $tmp_date->AddDay;
     }
 
+    $tickets->FromSQL( q{ Created >= '} . $start_date->ISO . q{ ' AND
+Created < '} . $end_date->ISO . q{'} );
+
     TICKET:
     while ( my $ticket = $tickets->Next ) {
         require RT::Extension::Reports::Filter;