[Rt-commit] r14107 - in rt/branches/3.999-DANGEROUS: . lib/RT share/html/Admin/Queues share/html/Dashboards share/html/Dashboards/Elements share/html/Elements share/html/Elements/RT__Model__Queue share/html/Search share/html/SelfService/Elements share/html/Ticket share/html/Ticket/Elements t/mail
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Tue Jul 15 04:57:24 EDT 2008
Author: sunnavy
Date: Tue Jul 15 04:57:24 2008
New Revision: 14107
Modified:
rt/branches/3.999-DANGEROUS/ (props changed)
rt/branches/3.999-DANGEROUS/lib/RT/Dashboard.pm
rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Modify.html
rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/index.html
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowDashboards
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Render.html
rt/branches/3.999-DANGEROUS/share/html/Dashboards/Subscription.html
rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionAsTable/Header
rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionList
rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Queue/ColumnMap
rt/branches/3.999-DANGEROUS/share/html/Elements/SelectDate
rt/branches/3.999-DANGEROUS/share/html/Elements/ShowSearch
rt/branches/3.999-DANGEROUS/share/html/Elements/Submit
rt/branches/3.999-DANGEROUS/share/html/Elements/TicketList
rt/branches/3.999-DANGEROUS/share/html/Search/Bulk.html
rt/branches/3.999-DANGEROUS/share/html/Search/Results.html
rt/branches/3.999-DANGEROUS/share/html/SelfService/Elements/MyRequests
rt/branches/3.999-DANGEROUS/share/html/Ticket/Display.html
rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/Bookmark
rt/branches/3.999-DANGEROUS/t/mail/crypt-gnupg.t
Log:
r14473 at sunnavys-mb: sunnavy | 2008-07-15 14:08:53 +0800
keep fixing
Modified: rt/branches/3.999-DANGEROUS/lib/RT/Dashboard.pm
==============================================================================
--- rt/branches/3.999-DANGEROUS/lib/RT/Dashboard.pm (original)
+++ rt/branches/3.999-DANGEROUS/lib/RT/Dashboard.pm Tue Jul 15 04:57:24 2008
@@ -235,7 +235,7 @@
: $args{Create} ? "Create"
: "See";
- push @objects, $CurrentUser->UserObj
+ push @objects, $CurrentUser->user_object
if $self->CurrentUser->HasRight(
Right => "${prefix}OwnDashboard",
Object => $RT::System,
Modified: rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Modify.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Modify.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/Modify.html Tue Jul 15 04:57:24 2008
@@ -68,7 +68,7 @@
</tr>
<tr><td align="right"><&|/l&>Subject Tag</&>:</td>
-<td colspan="3"><input name="SubjectTag" value="<% $ARGS{'SubjectTag'} || ($Create ? "" : $queue_obj->SubjectTag || '' ) %>" size="60" /></td>
+<td colspan="3"><input name="SubjectTag" value="<% $ARGS{'SubjectTag'} || ($Create ? "" : $queue_obj->subject_tag || '' ) %>" size="60" /></td>
</tr>
<tr><td align="right"><&|/l&>Reply Address</&>:</td>
@@ -109,7 +109,8 @@
</tr>
% }
-<tr><td align="right"><input type="checkbox" class="checkbox" name="enabled" value="1" <%$enabledChecked|n%> /></td>
+<tr><td align="right"><input type="checkbox" class="checkbox" name="enabled"
+value="1" <%$enabled_checked|n%> /></td>
<td colspan="3"><&|/l&>enabled (Unchecking this box disables this queue)</&><br />
% $m->callback( %ARGS, queue_obj => $queue_obj, results => \@results );
</td></tr>
@@ -182,7 +183,7 @@
Callbackname => 'ProcessLinks'
);
push @results, @linkresults;
- push @results, process_ObjectCustomFieldUpdates( args_ref => \%ARGS, object => $queue_obj );
+ push @results, process_object_custom_field_updates( args_ref => \%ARGS, object => $queue_obj );
}
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/index.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/index.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Admin/Queues/index.html Tue Jul 15 04:57:24 2008
@@ -64,7 +64,7 @@
format => $format,
Collection => $queues,
AllowSorting => 1,
- PassArguments => [qw(format Rows Page order order_by FinddisabledQueues)],
+ PassArguments => [qw(format Rows Page order order_by FindDisabledQueues)],
&>
% }
<form method="post" action="<% RT->config->get('WebPath') %>/Admin/Queues/index.html">
@@ -78,7 +78,7 @@
my $queues = RT::Model::QueueCollection->new();
$queues->find_all_rows();
-if ($FinddisabledQueues) {
+if ($FindDisabledQueues) {
$caption = _("All Queues");
$queues->{'find_disabled_rows'} = 1;
} else {
@@ -91,6 +91,6 @@
</%INIT>
<%ARGS>
-$FinddisabledQueues => 0
+$FindDisabledQueues => 0
$format => undef
</%ARGS>
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowDashboards
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowDashboards (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Elements/ShowDashboards Tue Jul 15 04:57:24 2008
@@ -61,7 +61,7 @@
# map each subscription to a dashboard ID
my %subscription_for;
-for my $attr ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription')) {
+for my $attr ($session{'CurrentUser'}->user_object->attributes->named('Subscription')) {
$subscription_for{$attr->SubValue('DashboardId')} = $attr;
}
</%INIT>
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Render.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Render.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Render.html Tue Jul 15 04:57:24 2008
@@ -86,7 +86,7 @@
my $Loaded = 0;
# try to load the subscription to this id
-for my $sub ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription')) {
+for my $sub ($session{'CurrentUser'}->user_object->attributes->named('Subscription')) {
next unless $sub->SubValue('DashboardId') == $id;
$SubscriptionObj = $sub;
$Loaded = 1;
Modified: rt/branches/3.999-DANGEROUS/share/html/Dashboards/Subscription.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Dashboards/Subscription.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Dashboards/Subscription.html Tue Jul 15 04:57:24 2008
@@ -171,7 +171,7 @@
my ($title, @results);
my ($val, $msg);
my $Loaded = 0;
-my $timezone = $session{'CurrentUser'}->UserObj->Timezone || RT->config->get('Timezone');
+my $timezone = $session{'CurrentUser'}->user_object->timezone || RT->config->get('Timezone');
use RT::Dashboard;
my $DashboardObj = RT::Dashboard->new($session{'CurrentUser'});
@@ -179,7 +179,7 @@
my $SubscriptionObj = RT::Model::Attribute->new($session{'CurrentUser'});
# first let's see if we already have a subscription to this DashboardId
-for my $sub ($session{'CurrentUser'}->UserObj->Attributes->Named('Subscription')) {
+for my $sub ($session{'CurrentUser'}->user_object->attributes->named('Subscription')) {
next unless $sub->SubValue('DashboardId') == $DashboardId;
$SubscriptionObj = $sub;
last;
@@ -240,7 +240,7 @@
Name => 'Subscription',
description => 'Subscription to dashboard ' . $DashboardId,
ContentType => 'storable',
- Object => $session{'CurrentUser'}->UserObj,
+ Object => $session{'CurrentUser'}->user_object,
Content => \%fields,
);
if ($val) {
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionAsTable/Header
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionAsTable/Header (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionAsTable/Header Tue Jul 15 04:57:24 2008
@@ -67,7 +67,7 @@
my $generic_query_args = $GenericQueryArgs || {map { $_ => $ARGS{$_} } @PassArguments};
# backward compatibility workaround
-$generic_query_args->{'format'} = $formatString if grep $_ eq 'format', @PassArguments;
+$generic_query_args->{'format'} = $format_string if grep $_ eq 'format', @PassArguments;
my $item = 0;
foreach my $col ( @format ) {
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionList
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionList (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/CollectionList Tue Jul 15 04:57:24 2008
@@ -46,7 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<%INIT>
-if (!$Collection && $Class eq 'RT::Model::Tickets') {
+if (!$Collection && $Class eq 'RT::Model::TicketCollection') {
$Collection = RT::Model::TicketCollection->new;
$Collection->from_sql($Query);
}
@@ -99,7 +99,7 @@
$m->out('<table border="0" cellspacing="0" cellpadding="1"' .
' width="100%" class="' .
- ($Collection->isa('RT::Model::Tickets') ? 'ticket-list' : 'collection') . '">');
+ ($Collection->isa('RT::Model::TicketCollection') ? 'ticket-list' : 'collection') . '">');
if ( $ShowHeader ) {
$m->comp('/Elements/CollectionAsTable/Header',
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Queue/ColumnMap
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Queue/ColumnMap (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/RT__Model__Queue/ColumnMap Tue Jul 15 04:57:24 2008
@@ -60,7 +60,7 @@
disabled => {
title => \' ',
attribute => 'disabled',
- value => sub { return $_[0]->disabled? $_[0]->_('disabled'): $_[0]->_('enabled') },
+ value => sub { return $_[0]->disabled? _('disabled'): _('enabled') },
},
Priority => {
value => sub { return $_[0]->initial_priority .'-'. $_[0]->final_priority },
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/SelectDate
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/SelectDate (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/SelectDate Tue Jul 15 04:57:24 2008
@@ -48,7 +48,7 @@
<script type="text/javascript"><!--
onLoadHook('createCalendarLink("<% $name %>");');
--></script>
-<input type="text" id="<% $name %>" name="<% $name %>" value="<% $Value %>" size="<% $Size %>" />
+<input type="text" id="<% $name %>" name="<% $name %>" value="<% $value %>" size="<% $Size %>" />
<%init>
unless ((defined $default) or
($current <= 0)) {
@@ -58,7 +58,7 @@
$year+1900,$mon+1,$mday,
$hour,$min);
}
-$Value = $Value || $default;
+$value = $value || $default;
unless ($name) {
$name = $menu_prefix. "_date";
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/ShowSearch
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/ShowSearch (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/ShowSearch Tue Jul 15 04:57:24 2008
@@ -51,7 +51,8 @@
titleright => $customize ? _('Edit') : '',
titleright_href => $customize,
hideable => $hideable &>
-<& $query_display_component, hideable => $hideable, %$ProcessedSearchArg, ShowNavigation => 0, Class => 'RT::Model::Tickets' &>
+<& $query_display_component, hideable => $hideable, %$ProcessedSearchArg,
+ ShowNavigation => 0, Class => 'RT::Model::TicketCollection' &>
</&>
<%init>
my $search;
@@ -72,13 +73,14 @@
+ $m->out(loc("Saved Search %1 not found", $SavedSearch)) unless $IgnoreMissing;
return;
}
- $SearchArg->{'SearchType'} ||= 'Ticket';
- if ( $SearchArg->{SearchType} ne 'Ticket' ) {
+ $SearchArg->{'search_type'} ||= 'Ticket';
+ if ( $SearchArg->{search_type} ne 'Ticket' ) {
# XXX: dispatch to different handler here
$query_display_component
- = '/Search/Elements/' . $SearchArg->{SearchType};
- $query_link_url = RT->config->get('WebURL') . "/Search/$SearchArg->{SearchType}.html";
+ = '/Search/Elements/' . $SearchArg->{search_type};
+ $query_link_url = RT->config->get('WebURL') .
+ "/Search/$SearchArg->{search_type}.html";
} else {
$customize = RT->config->get('WebPath') . '/Search/Build.html?'
. $m->comp( '/Elements/QueryString',
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/Submit
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/Submit (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/Submit Tue Jul 15 04:57:24 2008
@@ -92,7 +92,7 @@
$ClearAllLabel => _('Clear All')
$Checkboxname => ''
$Back => undef
-$Backname => 'Back'
+$BackName => 'Back'
$BackLabel => _('Back')
$BackCaption => ''
$BackOnClick => undef
Modified: rt/branches/3.999-DANGEROUS/share/html/Elements/TicketList
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Elements/TicketList (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Elements/TicketList Tue Jul 15 04:57:24 2008
@@ -49,7 +49,7 @@
$m->comp(
'/Elements/CollectionList',
%ARGS,
- Class => 'RT::Model::Tickets'
+ Class => 'RT::Model::TicketCollection'
);
</%INIT>
<%ARGS>
Modified: rt/branches/3.999-DANGEROUS/share/html/Search/Bulk.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Search/Bulk.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Search/Bulk.html Tue Jul 15 04:57:24 2008
@@ -71,7 +71,7 @@
Rows => $Rows,
Page => $Page,
baseURL => RT->config->get('WebPath')."/Search/Bulk.html?",
- Class => 'RT::Model::Tickets'
+ Class => 'RT::Model::TicketCollection'
&>
% $m->callback(Callbackname => 'AfterTicketList', args_ref => \%ARGS);
Modified: rt/branches/3.999-DANGEROUS/share/html/Search/Results.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Search/Results.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Search/Results.html Tue Jul 15 04:57:24 2008
@@ -66,7 +66,7 @@
Page => $Page,
format => $format,
baseURL => RT->config->get('WebPath')."/Search/Results.html?"
- Class => 'RT::Model::Tickets',
+ Class => 'RT::Model::TicketCollection',
&>
% my %hiddens = (query => $query, format => $format, Rows => $Rows, order_by => $order_by, order => $order, HideResults => $HideResults, Page => $Page );
Modified: rt/branches/3.999-DANGEROUS/share/html/SelfService/Elements/MyRequests
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/SelfService/Elements/MyRequests (original)
+++ rt/branches/3.999-DANGEROUS/share/html/SelfService/Elements/MyRequests Tue Jul 15 04:57:24 2008
@@ -56,7 +56,7 @@
baseURL => $baseURL,
GenericQueryArgs => $GenericQueryArgs,
AllowSorting => $AllowSorting,
- Class => 'RT::Model::Tickets',
+ Class => 'RT::Model::TicketCollection',
Rows => $Rows,
Page => $Page &>
</&>
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Display.html
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Display.html (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Display.html Tue Jul 15 04:57:24 2008
@@ -46,7 +46,7 @@
%#
%# END BPS TAGGED BLOCK }}}
<& /Elements/Header,
- Title => _("#%1: %2", $ticket_obj->id, $ticket_obj->Subject),
+ Title => _("#%1: %2", $ticket_obj->id, $ticket_obj->subject),
LinkRel => \%link_rel &>
<& /Ticket/Elements/Tabs,
Ticket => $ticket_obj,
@@ -143,9 +143,9 @@
$ARGS{UpdateAttachments} = $session{'Attachments'};
push @Actions,
- ProcessUpdateMessage(
+ process_update_message(
args_ref => \%ARGS,
- Actions => \@Actions,
+ actions => \@Actions,
ticket_obj => $ticket_obj,
);
delete $session{'Attachments'};
Modified: rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/Bookmark
==============================================================================
--- rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/Bookmark (original)
+++ rt/branches/3.999-DANGEROUS/share/html/Ticket/Elements/Bookmark Tue Jul 15 04:57:24 2008
@@ -46,8 +46,8 @@
%#
%# END BPS TAGGED BLOCK }}}
<%INIT>
-my $bookmarks = $session{'CurrentUser'}->UserObj->FirstAttribute('Bookmarks');
-$bookmarks = $bookmarks->Content if $bookmarks;
+my $bookmarks = $session{'CurrentUser'}->user_object->first_attribute('Bookmarks');
+$bookmarks = $bookmarks->content if $bookmarks;
$bookmarks ||= {};
if ( $Toggle ) {
@@ -56,7 +56,7 @@
} else {
$bookmarks->{ $id } = 1;
}
- $session{'CurrentUser'}->UserObj->SetAttribute(
+ $session{'CurrentUser'}->user_object->set_attribute(
Name => 'Bookmarks',
Content => $bookmarks,
);
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 Tue Jul 15 04:57:24 2008
@@ -14,6 +14,7 @@
use File::Spec ();
use Cwd;
+my $homedir = File::Spec->catdir( cwd(), qw(lib t data crypt-gnupg) );
my $homedir = RT::Test::get_abs_relocatable_dir(File::Spec->updir(),
qw(data gnupg keyrings) );
More information about the Rt-commit
mailing list