[Rt-commit] r18922 - in rt/3.999/trunk: . etc lib/RT/Interface lib/RT/Interface/Web share/html share/html/Admin/Elements share/html/Admin/Queues share/html/Elements share/html/REST/1.0 share/html/REST/1.0/Forms/queue share/html/Search share/html/SelfService share/html/Ticket share/html/Ticket/Elements
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Tue Mar 24 11:37:41 EDT 2009
Author: sunnavy
Date: Tue Mar 24 11:37:40 2009
New Revision: 18922
Removed:
rt/3.999/trunk/lib/RT/Interface/Web/Session.pm
Modified:
rt/3.999/trunk/Makefile.PL
rt/3.999/trunk/etc/config.yml
rt/3.999/trunk/lib/RT/Interface/Web.pm
rt/3.999/trunk/share/html/Admin/Elements/SelectCustomFieldLookupType
rt/3.999/trunk/share/html/Admin/Queues/Modify.html
rt/3.999/trunk/share/html/Elements/Error
rt/3.999/trunk/share/html/Elements/ListActions
rt/3.999/trunk/share/html/Elements/MyRT
rt/3.999/trunk/share/html/Elements/QueueSummary
rt/3.999/trunk/share/html/Elements/RefreshHomepage
rt/3.999/trunk/share/html/Elements/SelectQueue
rt/3.999/trunk/share/html/Prefs/MyRT.html
rt/3.999/trunk/share/html/Prefs/Quicksearch.html
rt/3.999/trunk/share/html/REST/1.0/Forms/queue/ticketcustomfields
rt/3.999/trunk/share/html/REST/1.0/logout
rt/3.999/trunk/share/html/Search/Build.html
rt/3.999/trunk/share/html/Search/Results.html
rt/3.999/trunk/share/html/SelfService/Display.html
rt/3.999/trunk/share/html/SelfService/Prefs.html
rt/3.999/trunk/share/html/Ticket/Create.html
rt/3.999/trunk/share/html/Ticket/Display.html
rt/3.999/trunk/share/html/Ticket/Elements/Tabs
rt/3.999/trunk/share/html/Ticket/Forward.html
rt/3.999/trunk/share/html/Ticket/Update.html
rt/3.999/trunk/share/html/index.html
Log:
no %session any more, use Jifty->web->session instead
Modified: rt/3.999/trunk/Makefile.PL
==============================================================================
--- rt/3.999/trunk/Makefile.PL (original)
+++ rt/3.999/trunk/Makefile.PL Tue Mar 24 11:37:40 2009
@@ -53,7 +53,6 @@
'Digest::MD5' => 2.27,
'CGI::Cookie' => 1.20,
'Storable' => 2.08,
- 'Apache::Session' => 1.53,
'XML::RSS' => 1.05,
'Text::WikiFormat' => 0.76,
'CSS::Squish' => 0.06,
Modified: rt/3.999/trunk/etc/config.yml
==============================================================================
--- rt/3.999/trunk/etc/config.yml (original)
+++ rt/3.999/trunk/etc/config.yml Tue Mar 24 11:37:40 2009
@@ -49,7 +49,6 @@
Web:
baseURL: http://localhost
DataDir: var/mason
- Globals: [%session]
MasonConfig:
autoflush: 0
Modified: rt/3.999/trunk/lib/RT/Interface/Web.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Interface/Web.pm (original)
+++ rt/3.999/trunk/lib/RT/Interface/Web.pm Tue Mar 24 11:37:40 2009
@@ -332,7 +332,7 @@
package HTML::Mason::Commands;
-use vars qw/$r $m %session/;
+use vars qw/$r $m/;
=head2 loc ARRAY
@@ -355,11 +355,11 @@
my $why = shift;
my %args = @_;
- if ( $session{'ErrorDocument'}
- && $session{'ErrorDocumentType'} )
+ if ( Jifty->web->session->get('ErrorDocument')
+ && Jifty->web->session->get('ErrorDocumentType') )
{
- $r->content_type( $session{'ErrorDocumentType'} );
- $m->comp( $session{'ErrorDocument'}, why => $why, %args );
+ $r->content_type( Jifty->web->session->get('ErrorDocumentType') );
+ $m->comp( Jifty->web->session->get('ErrorDocument'), why => $why, %args );
$m->abort;
} else {
$m->comp( "/Elements/Error", why => $why, %args );
Modified: rt/3.999/trunk/share/html/Admin/Elements/SelectCustomFieldLookupType
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Elements/SelectCustomFieldLookupType (original)
+++ rt/3.999/trunk/share/html/Admin/Elements/SelectCustomFieldLookupType Tue Mar 24 11:37:40 2009
@@ -51,7 +51,7 @@
%}
</select>
<%INIT>
-my $cf = RT::Model::CustomField->new( current_user => $session{current_user} );
+my $cf = RT::Model::CustomField->new( current_user => Jifty->web->current_user );
</%INIT>
<%ARGS>
Modified: rt/3.999/trunk/share/html/Admin/Queues/Modify.html
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Queues/Modify.html (original)
+++ rt/3.999/trunk/share/html/Admin/Queues/Modify.html Tue Mar 24 11:37:40 2009
@@ -150,7 +150,7 @@
if ( defined $id && $id eq 'new' ) {
my ($val, $msg) = $queue_obj->create( name => $name );
abort("$msg") unless $val;
- delete $session{'create_in_queues'};
+ Jifty->web->session->remove('create_in_queues');
push @results, $msg;
}
else {
Modified: rt/3.999/trunk/share/html/Elements/Error
==============================================================================
--- rt/3.999/trunk/share/html/Elements/Error (original)
+++ rt/3.999/trunk/share/html/Elements/Error Tue Mar 24 11:37:40 2009
@@ -81,7 +81,7 @@
Jifty->log->error($error);
-if ( defined $session{'SessionType'} && $session{'SessionType'} eq 'REST' ) {
+if ( defined Jifty->web->session->get('SessionType') && Jifty->web->session->get('SessionType') eq 'REST' ) {
$r->content_type('text/plain');
$m->out( "Error: " . $why . "\n" );
$m->out( $details . "\n" ) if defined $details && length $details;
Modified: rt/3.999/trunk/share/html/Elements/ListActions
==============================================================================
--- rt/3.999/trunk/share/html/Elements/ListActions (original)
+++ rt/3.999/trunk/share/html/Elements/ListActions Tue Mar 24 11:37:40 2009
@@ -56,19 +56,12 @@
</div>
<%init>
-# backward compatibility, don't use array in new code, but use keyed hash
-if ( ref( $session{'Actions'} ) eq 'ARRAY' ) {
- unshift @actions, @{ delete $session{'Actions'} };
-}
-
-if ( ref( $session{'Actions'}{''} ) eq 'ARRAY' ) {
- unshift @actions, @{ delete $session{'Actions'}{''} };
-}
-
my $actions_pointer = $m->request_args->{'results'};
-if ($actions_pointer && ref( $session{'Actions'}->{$actions_pointer} ) eq 'ARRAY' ) {
- unshift @actions, @{ delete $session{'Actions'}->{$actions_pointer} };
+if ($actions_pointer &&
+ ref Jifty->web->session->get("actions_$actions_pointer") eq 'ARRAY' ) {
+ unshift @actions, @{Jifty->web->session->get("actions_$actions_pointer")};
+ Jifty->web->session->remove("actions_$actions_pointer");
}
# XXX: run callbacks per row really crazy idea
Modified: rt/3.999/trunk/share/html/Elements/MyRT
==============================================================================
--- rt/3.999/trunk/share/html/Elements/MyRT (original)
+++ rt/3.999/trunk/share/html/Elements/MyRT Tue Mar 24 11:37:40 2009
@@ -65,12 +65,13 @@
my %allowed_components = map {$_ => 1} @{RT->config->get('HomepageComponents')};
my $user = Jifty->web->current_user->user_object;
-$portlets ||= $session{'my_rt_portlets'};
+$portlets ||= Jifty->web->session->get('my_rt_portlets');
unless ( $portlets ) {
my ($default_portlets) = RT::System->new()->attributes->named('HomepageSettings');
- $portlets = $session{'my_rt_portlets'} = $user->preferences(
+ $portlets = $user->preferences(
HomepageSettings => $default_portlets? $default_portlets->content: {},
);
+ Jifty->web->session->set('my_rt_portlets', $portlets);
}
my ($body, $summary) = @{$portlets}{qw(body summary)};
Modified: rt/3.999/trunk/share/html/Elements/QueueSummary
==============================================================================
--- rt/3.999/trunk/share/html/Elements/QueueSummary (original)
+++ rt/3.999/trunk/share/html/Elements/QueueSummary Tue Mar 24 11:37:40 2009
@@ -72,8 +72,8 @@
<%INIT>
my @queues;
-if ($cache && exists $session{$cache}) {
- @queues = @{$session{$cache}};
+if ($cache && Jifty->web->session->get($cache)) {
+ @queues = @{Jifty->web->session->get($cache)};
}
else {
my $Queues = RT::Model::QueueCollection->new( current_user => Jifty->web->current_user );
@@ -88,7 +88,7 @@
description => $_->description,
} } grep $_, @queues;
- $session{$cache} = \@queues if $cache;
+ Jifty->web->session->set($cache, \@queues) if $cache;
}
Modified: rt/3.999/trunk/share/html/Elements/RefreshHomepage
==============================================================================
--- rt/3.999/trunk/share/html/Elements/RefreshHomepage (original)
+++ rt/3.999/trunk/share/html/Elements/RefreshHomepage Tue Mar 24 11:37:40 2009
@@ -47,7 +47,7 @@
%# END BPS TAGGED BLOCK }}}
<&|/Widgets/TitleBox, title => _('Refresh')&>
<form method="get" action="<%RT->config->get('WebPath') . $m->request_comp->path %>">
-<& /Elements/Refresh, name => 'home_refresh_interval', default => $session {'home_refresh_interval'} &>
+<& /Elements/Refresh, name => 'home_refresh_interval', default => Jifty->web->session->get('home_refresh_interval') &>
<& /Elements/Submit, label => _('Go!') &>
</&>
</form>
Modified: rt/3.999/trunk/share/html/Elements/SelectQueue
==============================================================================
--- rt/3.999/trunk/share/html/Elements/SelectQueue (original)
+++ rt/3.999/trunk/share/html/Elements/SelectQueue Tue Mar 24 11:37:40 2009
@@ -55,7 +55,7 @@
% if ($show_null_option) {
<option value="">-</option>
% }
-% for my $queue (@{$session{$cache_key}}) {
+% for my $queue (@{Jifty->web->session->get($cache_key)||[]}) {
<option value="<% ($named_values ? $queue->{name} : $queue->{id}) %>"
% if ($queue->{id} eq ($default||'') || $queue->{name} eq ($default||'')) {
@@ -89,17 +89,19 @@
. Jifty->web->current_user->id
. "---$check_queue_right---$show_all_queues";
-if (not defined $session{$cache_key} and not $lite) {
+if (not defined Jifty->web->session->get($cache_key) and not $lite) {
my $q = RT::Model::QueueCollection->new( current_user => Jifty->web->current_user );
$q->find_all_rows;
while (my $queue = $q->next) {
if ($show_all_queues || $queue->current_user_has_right($check_queue_right)) {
- push @{$session{$cache_key}}, {
+ my $v = Jifty->web->session->get($cache_key) || [];
+ push @$v, {
id => $queue->id,
name => $queue->name,
description => $queue->description,
};
+ Jifty->web->session->set($cache_key, $v);
}
}
}
Modified: rt/3.999/trunk/share/html/Prefs/MyRT.html
==============================================================================
--- rt/3.999/trunk/share/html/Prefs/MyRT.html (original)
+++ rt/3.999/trunk/share/html/Prefs/MyRT.html Tue Mar 24 11:37:40 2009
@@ -98,15 +98,15 @@
if ($ARGS{reset}) {
my ($ok, $msg) = $user->set_preferences('HomepageSettings', {});
push @results, $ok ? _('Preferences saved.') : $msg;
- delete $session{'my_rt_portlets'};
+ Jifty->web->session->remove('my_rt_portlets');
}
-unless (exists $session{'my_rt_portlets'}) {
+unless (Jifty->web->session->get('my_rt_portlets')) {
my ($default_portlets) = RT::System->new()->attributes->named('HomepageSettings');
my $portlets = $default_portlets ? $default_portlets->content : {};
- $session{'my_rt_portlets'} = $user->preferences('HomepageSettings', $portlets);
+ Jifty->web->session->set('my_rt_portlets', $user->preferences('HomepageSettings', $portlets) );
}
-my $portlets = $session{'my_rt_portlets'};
+my $portlets = Jifty->web->session->get('my_rt_portlets');
my %seen;
my @items = map ["component-$_", $_], grep !$seen{$_}++, @{RT->config->get('HomepageComponents')};
@@ -146,7 +146,7 @@
my ( $conf, $pane ) = @_;
my ($ok, $msg) = $user->set_preferences( 'HomepageSettings', $conf );
push @results, $ok ? _('Preferences saved for %1.', $pane) : $msg;
- delete $session{'my_rt_portlets'};
+ Jifty->web->session->remove('my_rt_portlets');
}
);
Modified: rt/3.999/trunk/share/html/Prefs/Quicksearch.html
==============================================================================
--- rt/3.999/trunk/share/html/Prefs/Quicksearch.html (original)
+++ rt/3.999/trunk/share/html/Prefs/Quicksearch.html Tue Mar 24 11:37:40 2009
@@ -92,7 +92,7 @@
push @actions, $ok ? _('Preferences saved.') : $msg;
# Let QueueSummary rebuild the cache
- delete $session{'quick_search_queues'};
+ Jifty->web->session->remove('quick_search_queues');
}
</%INIT>
Modified: rt/3.999/trunk/share/html/REST/1.0/Forms/queue/ticketcustomfields
==============================================================================
--- rt/3.999/trunk/share/html/REST/1.0/Forms/queue/ticketcustomfields (original)
+++ rt/3.999/trunk/share/html/REST/1.0/Forms/queue/ticketcustomfields Tue Mar 24 11:37:40 2009
@@ -71,7 +71,7 @@
my @data;
push @data, [ id => "queue/" . $queue->Id ];
-my $qcfs = RT::CustomFields->new($session{CurrentUser});
+my $qcfs = RT::CustomFields->new(current_user => Jifty->web->current_user);
$qcfs->limit_to_global_or_queue($id);
while ( my $qcf = $qcfs->next() ) {
if ( $format eq "l" ) {
Modified: rt/3.999/trunk/share/html/REST/1.0/logout
==============================================================================
--- rt/3.999/trunk/share/html/REST/1.0/logout (original)
+++ rt/3.999/trunk/share/html/REST/1.0/logout Tue Mar 24 11:37:40 2009
@@ -46,6 +46,6 @@
%#
%# END BPS TAGGED BLOCK }}}
<%PERL>
-tied(%session)->delete if (defined %session);
+Jifty->web->session->remove_all;
</%PERL>
RT/<% $RT::VERSION %> 200 Ok
Modified: rt/3.999/trunk/share/html/Search/Build.html
==============================================================================
--- rt/3.999/trunk/share/html/Search/Build.html (original)
+++ rt/3.999/trunk/share/html/Search/Build.html Tue Mar 24 11:37:40 2009
@@ -135,15 +135,15 @@
%saved_search = ( id => 'new' );
# ..then wipe the session out..
- delete $session{'CurrentSearchHash'};
+ Jifty->web->session->remove('CurrentSearchHash');
# ..and the search results.
- $session{'tickets'}->clean_slate if defined $session{'tickets'};
+ Jifty->web->session->get('tickets')->clean_slate if defined Jifty->web->session->get('tickets');
}
{ # Attempt to load what we can from the session and preferences, set defaults
- my $current = $session{'CurrentSearchHash'};
+ my $current = Jifty->web->session->get('CurrentSearchHash');
my $prefs = Jifty->web->current_user->user_object->preferences("SearchDisplay") || {};
my $default = {query => '', format => '', order_by => 'id', order => 'ASC', rows_per_page => 50 };
@@ -282,12 +282,12 @@
# {{{ Push the updates into the session so we don't loose 'em
-$session{'CurrentSearchHash'} = {
+Jifty->web->session->set('CurrentSearchHash', {
%query,
search_id => $saved_search{'id'},
object => $saved_search{'object'},
description => $saved_search{'description'},
-};
+} );
# }}}
Modified: rt/3.999/trunk/share/html/Search/Results.html
==============================================================================
--- rt/3.999/trunk/share/html/Search/Results.html (original)
+++ rt/3.999/trunk/share/html/Search/Results.html Tue Mar 24 11:37:40 2009
@@ -45,7 +45,7 @@
%# those contributions and any derivatives thereof.
%#
%# END BPS TAGGED BLOCK }}}
-<&| /_elements/wrapper, title => $title, refresh => $session{'tickets_refresh_interval'},
+<&| /_elements/wrapper, title => $title, refresh => Jifty->web->session->get('tickets_refresh_interval'),
rss_auto_discovery => $RSSFeedURL,
link_rel => \%link_rel &>
<& /Ticket/Elements/Tabs,
@@ -75,7 +75,7 @@
% foreach my $key (keys(%hiddens)) {
<input type="hidden" class="hidden" name="<%$key%>" value="<% defined($hiddens{$key})?$hiddens{$key}:'' %>" />
% }
-<& /Elements/Refresh, name => 'tickets_refresh_interval', default => $session {'tickets_refresh_interval'} &>
+<& /Elements/Refresh, name => 'tickets_refresh_interval', default => Jifty->web->session->get('tickets_refresh_interval') &>
<input type="submit" class="button" value="<&|/l&>Change</&>" />
</form>
</div>
@@ -117,33 +117,32 @@
}
my ($title, $ticketcount);
-$session{'i'}++;
-$session{'tickets'} = RT::Model::TicketCollection->new( current_user => Jifty->web->current_user ) ;
-$session{'tickets'}->from_sql($query) if ($query);
+Jifty->web->session->set('tickets' => RT::Model::TicketCollection->new( current_user => Jifty->web->current_user ) );
+Jifty->web->session->get('tickets')->from_sql($query) if ($query);
if ($order_by =~ /\|/) {
# Multiple Sorts
my @order_by = split /\|/,$order_by;
my @order = split /\|/,$order;
- $session{'tickets'}->order_by(
+ Jifty->web->session->get('tickets')->order_by(
map { { column => $order_by[$_], order => $order[$_] } } ( 0
.. $#order_by ) );;
} else {
- $session{'tickets'}->order_by(column => $order_by, order => $order);
+ Jifty->web->session->get('tickets')->order_by(column => $order_by, order => $order);
}
-$session{'CurrentSearchHash'} = {
+Jifty->web->session->set('CurrentSearchHash', {
format => $format,
query => $query,
page => $page,
order => $order,
order_by => $order_by,
rows_per_page => $rows
- };
+ });
-if ( $session{'tickets'}->query()) {
- $ticketcount = $session{tickets}->count_all();
+if ( Jifty->web->session->get('tickets')->query()) {
+ $ticketcount = Jifty->web->session->get('tickets')->count_all();
$title = _('Found %quant(%1,ticket)', $ticketcount);
} else {
$title = _("Find tickets");
@@ -161,7 +160,7 @@
my $RSSFeedURL = RT->config->get('WebPath')."/Search/Results.rdf$RSSQueryString";
if ($ARGS{'tickets_refresh_interval'}) {
- $session{'tickets_refresh_interval'} = $ARGS{'tickets_refresh_interval'};
+ Jifty->web->session->set('tickets_refresh_interval', $ARGS{'tickets_refresh_interval'});
}
my %link_rel;
@@ -183,7 +182,7 @@
$link_rel{last} = $BaseURL . $genpage->(POSIX::ceil($ticketcount/$rows)) if $rows and ($page * $rows) < $ticketcount;
</%INIT>
<%CLEANUP>
-$session{'tickets'}->prep_for_serialization();
+Jifty->web->session->get('tickets')->prep_for_serialization();
</%CLEANUP>
<%ARGS>
$query => undef
Modified: rt/3.999/trunk/share/html/SelfService/Display.html
==============================================================================
--- rt/3.999/trunk/share/html/SelfService/Display.html (original)
+++ rt/3.999/trunk/share/html/SelfService/Display.html Tue Mar 24 11:37:40 2009
@@ -100,17 +100,17 @@
# store the uploaded attachment in session
if ( $ARGS{'attach'} ) { # attachment?
- $session{'Attachments'} = {} unless defined $session{'Attachments'};
+ Jifty->web->session->set('Attachments', {}) unless defined Jifty->web->session->get('Attachments');
my $attachment = make_mime_entity(
attachment_field_name => 'attach',
);
my $file_path = Encode::decode_utf8("$ARGS{'Attach'}");
- $session{'Attachments'} = {
- %{ $session{'Attachments'} || {} },
+ Jifty->web->session->set('Attachments', {
+ %{ Jifty->web->session->get('Attachments') || {} },
$file_path => $attachment,
- };
+ });
}
if ( defined ($id[0]) && $id[0] eq 'new' ) {
@@ -132,7 +132,7 @@
( $Ticket, @results ) =
- create_ticket( attachments => $session{'Attachments'}, %ARGS, status => 'new' );
+ create_ticket( attachments => Jifty->web->session->get('Attachments'), %ARGS, status => 'new' );
unless ( $Ticket->id ) {
$m->comp( 'Error.html', why => join( "\n", @results ));
@@ -142,8 +142,8 @@
# }}}
# delete temporary storage entry to make WebUI clean
- unless ( keys %{ $session{'Attachments'} } and $ARGS{'update_attach'} ) {
- delete $session{'Attachments'};
+ unless ( keys %{ Jifty->web->session->get('Attachments') } and $ARGS{'update_attach'} ) {
+ Jifty->web->session->remove('Attachments');
}
# }}}
@@ -159,24 +159,24 @@
if (
- $session{'Attachments'}
+ Jifty->web->session->get('Attachments')
|| ( defined $ARGS{'update_content'}
&& $ARGS{'update_content'} ne ''
&& $ARGS{'update_content'} ne "-- \n"
. Jifty->web->current_user->user_object->signature )
)
{
- $ARGS{update_attachments} = $session{'Attachments'};
+ $ARGS{update_attachments} = Jifty->web->session->get('Attachments');
}
push @results, process_update_message(
args_ref => \%ARGS,
ticket_obj => $Ticket
);
- delete $session{'Attachments'};
+ Jifty->web->session->remove('Attachments');
# delete temporary storage entry to make WebUI clean
- unless ( keys %{ $session{'Attachments'} } and $ARGS{'update_attach'} ) {
- delete $session{'Attachments'};
+ unless ( keys %{ Jifty->web->session->get('Attachments') } and $ARGS{'update_attach'} ) {
+ Jifty->web->session->remove('Attachments');
}
my @cfupdates = process_object_custom_field_updates(object => $Ticket, args_ref => \%ARGS);
@@ -211,8 +211,7 @@
# resubmission on refresh.
# But we need to store Actions somewhere too, so we don't lose them.
my $key = Digest::MD5::md5_hex(rand(1024));
- push @{ $session{"Actions"}->{$key} ||= [] }, @results;
- $session{'i'}++;
+ Jifty->web->session->set( "actions_$key" => \@Actions );
RT::Interface::Web::redirect( RT->config->get('WebURL') ."SelfService/Display.html?id=". $Ticket->id."&results=".$key);
}
Modified: rt/3.999/trunk/share/html/SelfService/Prefs.html
==============================================================================
--- rt/3.999/trunk/share/html/SelfService/Prefs.html (original)
+++ rt/3.999/trunk/share/html/SelfService/Prefs.html Tue Mar 24 11:37:40 2009
@@ -81,9 +81,7 @@
push (@results, "Signature: ".$msg);
}
}
-#A hack to make sure that session gets rewritten.
-$session{'i'}++;
</%INIT>
<%ARGS>
Modified: rt/3.999/trunk/share/html/Ticket/Create.html
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Create.html (original)
+++ rt/3.999/trunk/share/html/Ticket/Create.html Tue Mar 24 11:37:40 2009
@@ -128,13 +128,13 @@
% }
% }
<tr>
-% if (exists $session{'Attachments'}) {
+% if (Jifty->web->session->get('Attachments')) {
<td class="label">
<&|/l&>Attached file</&>:
</td>
<td colspan="5">
<&|/l&>Check box to delete</&><br />
-% foreach my $attach_name (keys %{$session{'Attachments'}}) {
+% foreach my $attach_name (keys %{Jifty->web->session->get('Attachments')}) {
<input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
% } # end of foreach
</td>
@@ -342,9 +342,11 @@
# {{{ deal with deleting uploaded attachments
foreach my $key (keys %ARGS) {
if ($key =~ m/^DeleteAttach-(.+)$/) {
- delete $session{'Attachments'}{$1};
+ my $v = Jifty->web->session->get('Attachments');
+ delete $v->{$1};
+ Jifty->web->session->set('Attachments', $v);
}
- $session{'Attachments'} = { %{$session{'Attachments'} || {}} };
+ Jifty->web->session->set('Attachments', { %{Jifty->web->session->get('Attachments') || {}} } );
}
# {{{ store the uploaded attachment in session
@@ -353,17 +355,17 @@
attachment_field_name => 'attach'
);
my $file_path = Encode::decode_utf8("$ARGS{'attach'}");
- $session{'Attachments'} = {
- %{$session{'Attachments'} || {}},
+ Jifty->web->session->set('Attachments', {
+ %{Jifty->web->session->get('Attachments') || {}},
$file_path => $attachment,
- };
+ });
}
# }}}
# delete temporary storage entry to make WebUI clean
-unless (keys %{$session{'Attachments'}} and $ARGS{'id'} eq 'new') {
- delete $session{'Attachments'};
+unless (keys %{Jifty->web->session->get('Attachments')} and $ARGS{'id'} eq 'new') {
+ Jifty->web->session->remove('Attachments');
}
my $checks_failure = 0;
Modified: rt/3.999/trunk/share/html/Ticket/Display.html
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Display.html (original)
+++ rt/3.999/trunk/share/html/Ticket/Display.html Tue Mar 24 11:37:40 2009
@@ -116,9 +116,11 @@
}
($ticket_obj, @Actions) = create_ticket(
- Attachments => delete $session{'Attachments'},
+ Attachments => Jifty->web->session->get('Attachments'),
%ARGS,
);
+ Jifty->web->session->remove('Attachments');
+
#XXX bloody hack, should have a better way
my %cf_args;
for my $arg ( keys %ARGS ) {
@@ -153,14 +155,14 @@
args_ref => \%ARGS,
actions => \@Actions);
- $ARGS{update_attachments} = $session{'Attachments'};
+ $ARGS{update_attachments} = Jifty->web->session->get('Attachments');
push @Actions,
process_update_message(
args_ref => \%ARGS,
actions => \@Actions,
ticket_obj => $ticket_obj,
);
- delete $session{'Attachments'};
+ Jifty->web->session->remove('Attachments');
#Process status updates
push @Actions, process_ticket_watchers(args_ref => \%ARGS, ticket_obj => $ticket_obj);
@@ -199,9 +201,7 @@
# resubmission on refresh.
# But we need to store Actions somewhere too, so we don't lose them.
my $key = Digest::MD5::md5_hex( rand(1024) );
- push @{ $session{"Actions"}->{$key} ||= [] }, @Actions;
- $session{'i'}++;
-
+ Jifty->web->session->set( "actions_$key" => \@Actions );
RT::Interface::Web::redirect( RT->config->get('WebURL') . "Ticket/Display.html?id=" . $ticket_obj->id . "&results=" . $key );
}
@@ -209,8 +209,8 @@
my $attachment_content = $m->comp('Elements/LoadTextAttachments', ticket => $ticket_obj);
my %link_rel;
-if (defined $session{'tickets'} and ($ARGS{'query'} or $session{'CurrentSearchHash'}->{'Query'})) {
- my $item_map = $session{'tickets'}->item_map;
+if (defined Jifty->web->session->get('tickets') and ($ARGS{'query'} or Jifty->web->session->get('CurrentSearchHash')->{'Query'})) {
+ my $item_map = Jifty->web->session->get('tickets')->item_map;
$link_rel{first} = "Ticket/Display.html?id=" . $item_map->{first} if $item_map->{$ticket_obj->id}{prev};
$link_rel{prev} = "Ticket/Display.html?id=" . $item_map->{$ticket_obj->id}{prev} if $item_map->{$ticket_obj->id}{prev};
$link_rel{next} = "Ticket/Display.html?id=" . $item_map->{$ticket_obj->id}{next} if $item_map->{$ticket_obj->id}{next};
Modified: rt/3.999/trunk/share/html/Ticket/Elements/Tabs
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Elements/Tabs (original)
+++ rt/3.999/trunk/share/html/Ticket/Elements/Tabs Tue Mar 24 11:37:40 2009
@@ -62,16 +62,15 @@
my $id = $ticket->id();
- if ( defined $session{'tickets'} ) {
+ if ( defined Jifty->web->session->get('tickets') ) {
# we have to update session data if we get new ItemMap
- my $updatesession = 1 unless ( $session{'tickets'}->{'item_map'} );
+ my $updatesession = 1 unless ( Jifty->web->session->get('tickets')->{'item_map'} );
- my $item_map = $session{'tickets'}->item_map;
+ my $item_map = Jifty->web->session->get('tickets')->item_map;
if ($updatesession) {
- $session{'i'}++;
- $session{'tickets'}->prep_for_serialization();
+ Jifty->web->session->get('tickets')->prep_for_serialization();
}
# Don't display prev links if we're on the first ticket
@@ -252,20 +251,20 @@
my $has_query = '';
my %query_args;
my $search_id = $ARGS{'saved_search_id'}
- || $session{'CurrentSearchHash'}->{'searchid'} || '';
+ || Jifty->web->session->get('CurrentSearchHash') && Jifty->web->session->get('CurrentSearchHash')->{'searchid'} || '';
-$has_query = 1 if ( $ARGS{'query'} or $session{'CurrentSearchHash'}->{'query'} );
+$has_query = 1 if ( $ARGS{'query'} or Jifty->web->session->get('CurrentSearchHash') && Jifty->web->session->get('CurrentSearchHash')->{'query'} );
%query_args = (
saved_search_id => ($search_id eq 'new') ? undef : $search_id,
- query => $ARGS{'query'} || $session{'CurrentSearchHash'}->{'query'},
- format => $ARGS{'format'} || $session{'CurrentSearchHash'}->{'format'},
+ query => $ARGS{'query'} || Jifty->web->session->get('CurrentSearchHash') && Jifty->web->session->get('CurrentSearchHash')->{'query'},
+ format => $ARGS{'format'} || Jifty->web->session->get('CurrentSearchHash') && Jifty->web->session->get('CurrentSearchHash')->{'format'},
order_by => $ARGS{'order_by'}
- || $session{'CurrentSearchHash'}->{'order_by'},
- order => $ARGS{'order'} || $session{'CurrentSearchHash'}->{'order'},
- page => $ARGS{'page'} || $session{'CurrentSearchHash'}->{'page'},
- rows_per_page => $ARGS{'rows_per_page'} || $session{'CurrentSearchHash'}->{'rows_per_page'},
+ || Jifty->web->session->get('CurrentSearchHash') && Jifty->web->session->get('CurrentSearchHash')->{'order_by'},
+ order => $ARGS{'order'} || Jifty->web->session->get('CurrentSearchHash') && Jifty->web->session->get('CurrentSearchHash')->{'order'},
+ page => $ARGS{'page'} || Jifty->web->session->get('CurrentSearchHash') && Jifty->web->session->get('CurrentSearchHash')->{'page'},
+ rows_per_page => $ARGS{'rows_per_page'} || Jifty->web->session->get('CurrentSearchHash') && Jifty->web->session->get('CurrentSearchHash')->{'rows_per_page'},
);
$args = "?" . $m->comp( '/Elements/QueryString', %query_args );
Modified: rt/3.999/trunk/share/html/Ticket/Forward.html
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Forward.html (original)
+++ rt/3.999/trunk/share/html/Ticket/Forward.html Tue Mar 24 11:37:40 2009
@@ -98,9 +98,8 @@
push @results, $msg;
if ( $forward_and_return ) {
- $session{'i'}++;
my $key = Digest::MD5::md5_hex(rand(1024));
- push @{ $session{"Actions"}->{$key} ||= [] }, @results;
+ Jifty->web->session->set( "actions_$key" => \@Actions );
RT::Interface::Web::redirect( RT->config->get('WebURL') ."Ticket/Display.html?id=". $id."&results=".$key);
}
}
Modified: rt/3.999/trunk/share/html/Ticket/Update.html
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/Update.html (original)
+++ rt/3.999/trunk/share/html/Ticket/Update.html Tue Mar 24 11:37:40 2009
@@ -109,11 +109,11 @@
% } # end if while
% } # end of if
-% if (exists $session{'Attachments'}) {
+% if (Jifty->web->session->get('Attachments')) {
<tr><td><&|/l&>Attached file</&>:</td>
<td>
<&|/l&>Check box to delete</&><br />
-% foreach my $attach_name (keys %{$session{'Attachments'}}) {
+% foreach my $attach_name (keys %{Jifty->web->session->get('Attachments')}) {
<input type="checkbox" class="checkbox" name="DeleteAttach-<%$attach_name%>" value="1" /><%$attach_name%><br />
% } # end of foreach
</td>
@@ -208,9 +208,11 @@
# {{{ deal with deleting uploaded attachments
foreach my $key (keys %ARGS) {
if ($key =~ m/^DeleteAttach-(.+)$/) {
- delete $session{'Attachments'}{$1};
+ my $v = Jifty->web->session->get('Attachments');
+ delete $v->{$1};
+ Jifty->web->session->set( 'Attachments', $v );
}
- $session{'Attachments'} = { %{$session{'Attachments'} || {}} };
+ Jifty->web->session->set('Attachments', { %{Jifty->web->session->get('Attachments') || {}} } );
}
# }}}
@@ -221,16 +223,16 @@
);
my $file_path = Encode::decode_utf8("$ARGS{'Attach'}");
- $session{'Attachments'} = {
- %{$session{'Attachments'} || {}},
+ Jifty->web->session->set('Attachments', {
+ %{Jifty->web->session->get('Attachments') || {}},
$file_path => $attachment,
- };
+ });
}
# }}}
# delete temporary storage entry to make WebUI clean
-unless (keys %{$session{'Attachments'}} and $ARGS{'update_attach'}) {
- delete $session{'Attachments'};
+unless (keys %{Jifty->web->session->get('Attachments')} and $ARGS{'update_attach'}) {
+ Jifty->web->session->remove('Attachments');
}
# }}}
Modified: rt/3.999/trunk/share/html/index.html
==============================================================================
--- rt/3.999/trunk/share/html/index.html (original)
+++ rt/3.999/trunk/share/html/index.html Tue Mar 24 11:37:40 2009
@@ -75,7 +75,7 @@
%#
%# END BPS TAGGED BLOCK }}}
-<&| /_elements/wrapper, title=>_("RT at a glance"), refresh => $session{'home_refresh_interval'} &>
+<&| /_elements/wrapper, title=>_("RT at a glance"), refresh => Jifty->web->session->get('home_refresh_interval') &>
<& /Elements/Tabs,
current_toptab => '',
title=>_("RT at a glance"),
@@ -126,7 +126,7 @@
}
if ($ARGS{'home_refresh_interval'}) {
- $session{'home_refresh_interval'} = $ARGS{'home_refresh_interval'};
+ Jifty->web->session->get('home_refresh_interval') = $ARGS{'home_refresh_interval'};
}
my $actions;
More information about the Rt-commit
mailing list