[Rt-commit] r18099 - in rt/3.999/branches/merge_to_3.8.2: . share/html/SelfService/Elements

[sunnavy at bestpractical.com]

Author: sunnavy
Date: Fri Jan 30 03:31:02 2009
New Revision: 18099

Modified:
   rt/3.999/branches/merge_to_3.8.2/   (props changed)
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MySupportQueues
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/QueueSummary
   rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Quicksearch
   rt/3.999/branches/merge_to_3.8.2/share/html/SelfService/Elements/MyRequests

Log:
 r19388 at sunnavys-mb:  sunnavy | 2009-01-30 16:15:02 +0800
 no active_status_array method for queue any more, use ->status_schema instead


Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MySupportQueues
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MySupportQueues	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/MySupportQueues	Fri Jan 30 03:31:02 2009
@@ -54,7 +54,7 @@
 </&>
 <%INIT>
 my @conditions = ();
-foreach ( RT::Model::Queue->active_status_array ) {
+foreach ( RT::Model::Queue->status_schema->valid('initial', 'active') ) {
     push @conditions, { cond => "Status = '$_'", name => _($_) };
 }
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/QueueSummary
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/QueueSummary	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/QueueSummary	Fri Jan 30 03:31:02 2009
@@ -58,7 +58,8 @@
 %   my $name = $queue->{name};
 %   $name =~ s/'/\\'/g;
 %   my $queue_cond = "Queue = '$name' AND ";
-%   my $all_q = $queue_cond . '(' . join( " OR ", map "Status = '$_'", RT::Model::Queue->active_status_array()) . ')';
+%   my $all_q = $queue_cond . '(' . join( " OR ", map "Status = '$_'",
+%   RT::Model::Queue->status_schema->valid('initial', 'active' )) . ')';
 <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>
 %   for my $condition (@$conditions) {

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Quicksearch
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Quicksearch	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/Elements/Quicksearch	Fri Jan 30 03:31:02 2009
@@ -59,7 +59,7 @@
 my $unwanted = Jifty->web->current_user->user_object->preferences('QuickSearch', {});
 
 my @conditions = ();
-foreach ( RT::Model::Queue->active_status_array ) {
+foreach ( RT::Model::Queue->status_schema->valid('initial', 'active') ) {
     push @conditions, { cond => "Status = '$_'", name => _($_) };
 }
 </%INIT>

Modified: rt/3.999/branches/merge_to_3.8.2/share/html/SelfService/Elements/MyRequests
==============================================================================
--- rt/3.999/branches/merge_to_3.8.2/share/html/SelfService/Elements/MyRequests	(original)
+++ rt/3.999/branches/merge_to_3.8.2/share/html/SelfService/Elements/MyRequests	Fri Jan 30 03:31:02 2009
@@ -80,7 +80,7 @@
 $friendly_status => _('open')
 $title => _("My %1 tickets", $friendly_status)
 @roles => ('Watcher')
- at status => RT::Model::Queue->active_status_array()
+ at status => RT::Model::Queue->status_schema->valid('initial', 'active')
 $base_url => undef
 $page => 1
 $generic_query_args => undef