[Rt-commit] r19563 - in rt/3.999/trunk: . etc lib/RT lib/RT/Interface lib/RT/URI sbin share/html share/html/Dashboards share/html/Elements share/html/Install share/html/NoAuth/iCal share/html/Search share/html/Search/Elements share/html/SelfService share/html/Ticket
sunnavy at bestpractical.com
sunnavy at bestpractical.com
Thu May 7 03:37:05 EDT 2009
Author: sunnavy
Date: Thu May 7 03:37:04 2009
New Revision: 19563
Modified:
rt/3.999/trunk/ (props changed)
rt/3.999/trunk/etc/initialdata
rt/3.999/trunk/lib/RT/Dispatcher.pm
rt/3.999/trunk/lib/RT/Interface/Web.pm
rt/3.999/trunk/lib/RT/URI/fsck_com_rt.pm
rt/3.999/trunk/sbin/rt-email-dashboards
rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket
rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--User
rt/3.999/trunk/share/html/Dashboards/Modify.html
rt/3.999/trunk/share/html/Elements/ShowSearch
rt/3.999/trunk/share/html/Install/DatabaseDetails.html
rt/3.999/trunk/share/html/Install/autohandler
rt/3.999/trunk/share/html/NoAuth/iCal/dhandler
rt/3.999/trunk/share/html/Search/Elements/ResultViews
rt/3.999/trunk/share/html/Search/Results.rdf
rt/3.999/trunk/share/html/Search/Simple.html
rt/3.999/trunk/share/html/SelfService/Display.html
rt/3.999/trunk/share/html/Ticket/Display.html
rt/3.999/trunk/share/html/Ticket/Forward.html
rt/3.999/trunk/share/html/Ticket/GnuPG.html
rt/3.999/trunk/share/html/index.html
Log:
r20990 at sunnavys-mb (orig r19437): sunnavy | 2009-05-05 14:16:26 +0800
Jifty->web->url is better
Modified: rt/3.999/trunk/etc/initialdata
==============================================================================
--- rt/3.999/trunk/etc/initialdata (original)
+++ rt/3.999/trunk/etc/initialdata Thu May 7 03:37:04 2009
@@ -437,7 +437,7 @@
Greetings,
-Someone at {$ENV{'REMOTE_ADDR'}} requested a password reset for you on {Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/'}
+Someone at {$ENV{'REMOTE_ADDR'}} requested a password reset for you on {Jifty->web->url}
Your new password is:
{$Newpassword}
Modified: rt/3.999/trunk/lib/RT/Dispatcher.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/Dispatcher.pm (original)
+++ rt/3.999/trunk/lib/RT/Dispatcher.pm Thu May 7 03:37:04 2009
@@ -137,12 +137,12 @@
# if the user is trying to access a ticket, redirect them
if ( $path =~ '^(/+)Ticket/Display.html' && get('id') ) {
- Jifty->web->redirect( Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' . "SelfService/Display.html?id=" . get('id') );
+ Jifty->web->redirect( Jifty->web->url . "SelfService/Display.html?id=" . get('id') );
}
# otherwise, drop the user at the SelfService default page
elsif ( $path !~ '^(/+)SelfService/' ) {
- Jifty->web->redirect( Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' . "SelfService/" );
+ Jifty->web->redirect( Jifty->web->url . "SelfService/" );
}
}
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 Thu May 7 03:37:04 2009
@@ -127,7 +127,7 @@
sub redirect {
my $redir_to = shift;
my $uri = URI->new($redir_to);
- my $server_uri = URI->new( Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' );
+ my $server_uri = URI->new( Jifty->web->url );
# If the user is coming in via a non-canonical
# hostname, don't redirect them to the canonical host,
Modified: rt/3.999/trunk/lib/RT/URI/fsck_com_rt.pm
==============================================================================
--- rt/3.999/trunk/lib/RT/URI/fsck_com_rt.pm (original)
+++ rt/3.999/trunk/lib/RT/URI/fsck_com_rt.pm Thu May 7 03:37:04 2009
@@ -200,7 +200,7 @@
&& $self->object
&& ( $self->object_type eq 'ticket' ) )
{
- return ( Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' . "Ticket/Display.html?id=" . $self->object->id );
+ return ( Jifty->web->url . "Ticket/Display.html?id=" . $self->object->id );
} else {
return ( $self->uri );
}
Modified: rt/3.999/trunk/sbin/rt-email-dashboards
==============================================================================
--- rt/3.999/trunk/sbin/rt-email-dashboards (original)
+++ rt/3.999/trunk/sbin/rt-email-dashboards Thu May 7 03:37:04 2009
@@ -245,7 +245,7 @@
$contents = HTML::RewriteAttributes::Links->rewrite(
$contents,
- Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' . '/Dashboards/Render.html',
+ Jifty->web->url . '/Dashboards/Render.html',
);
email_dashboard($currentuser, $email, $dashboard, $subscription, $contents);
Modified: rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment (original)
+++ rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--Attachment Thu May 7 03:37:04 2009
@@ -48,6 +48,6 @@
<%ARGS>
$object => undef
</%ARGS>
-<a href="<% Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' %>/Ticket/Attachment/<% $object->transaction_id %>/<% $object->id %>/">
+<a href="<% Jifty->web->url %>/Ticket/Attachment/<% $object->transaction_id %>/<% $object->id %>/">
Attachment(id:<% $object->id %>, Filename: <% $object->filename || '(no value)' %>)
</a>
Modified: rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket (original)
+++ rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--Ticket Thu May 7 03:37:04 2009
@@ -48,6 +48,6 @@
<%ARGS>
$object => undef
</%ARGS>
-<a href="<% Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' %>/Ticket/Display.html?id=<% $object->id %>">
+<a href="<% Jifty->web->url %>/Ticket/Display.html?id=<% $object->id %>">
Ticket(id:<% $object->id %>, Subject: <% substr($object->subject, 0, 30) %>...)
</a>
Modified: rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--User
==============================================================================
--- rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--User (original)
+++ rt/3.999/trunk/share/html/Admin/Tools/Shredder/Elements/Object/RT--User Thu May 7 03:37:04 2009
@@ -48,6 +48,6 @@
<%ARGS>
$object => undef
</%ARGS>
-<a href="<% Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' %>/Admin/Users/Modify.html?id=<% $object->id %>">
+<a href="<% Jifty->web->url %>/Admin/Users/Modify.html?id=<% $object->id %>">
User(id:<% $object->id %>, name: <% $object->name %>)
</a>
Modified: rt/3.999/trunk/share/html/Dashboards/Modify.html
==============================================================================
--- rt/3.999/trunk/share/html/Dashboards/Modify.html (original)
+++ rt/3.999/trunk/share/html/Dashboards/Modify.html Thu May 7 03:37:04 2009
@@ -151,7 +151,7 @@
$ok || abort(_("Couldn't delete dashboard %1: %2", $id, $msg));
# put the user back into a useful place with a message
- RT::Interface::Web::redirect(Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/'."Dashboards/index.html?deleted=$id");
+ RT::Interface::Web::redirect(Jifty->web->url."Dashboards/index.html?deleted=$id");
}
</%INIT>
Modified: rt/3.999/trunk/share/html/Elements/ShowSearch
==============================================================================
--- rt/3.999/trunk/share/html/Elements/ShowSearch (original)
+++ rt/3.999/trunk/share/html/Elements/ShowSearch Thu May 7 03:37:04 2009
@@ -79,7 +79,7 @@
# XXX: dispatch to different handler here
$query_display_component
= '/Search/Elements/' . $SearchArg->{search_type};
- $query_link_url = Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' .
+ $query_link_url = Jifty->web->url .
"/Search/$SearchArg->{search_type}.html";
} else {
$customize = RT->config->get('web_path') . '/Search/Build.html?'
Modified: rt/3.999/trunk/share/html/Install/DatabaseDetails.html
==============================================================================
--- rt/3.999/trunk/share/html/Install/DatabaseDetails.html (original)
+++ rt/3.999/trunk/share/html/Install/DatabaseDetails.html Thu May 7 03:37:04 2009
@@ -95,12 +95,12 @@
# store => $RT::Installer->{InstallConfig},
# meta => $RT::Installer->{Meta}, keep_undef => 1 );
# if ( $back ) {
-# RT::Interface::Web::redirect(Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' .
+# RT::Interface::Web::redirect(Jifty->web->url .
#'Install/DatabaseType.html');
# }
#
# if ( $ARGS{next} ) {
-# RT::Interface::Web::redirect(Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' .
+# RT::Interface::Web::redirect(Jifty->web->url .
#'Install/Basics.html');
# }
# my ( $status, $msg ) = RT::Installer->save_config;
Modified: rt/3.999/trunk/share/html/Install/autohandler
==============================================================================
--- rt/3.999/trunk/share/html/Install/autohandler (original)
+++ rt/3.999/trunk/share/html/Install/autohandler Thu May 7 03:37:04 2009
@@ -59,7 +59,7 @@
}
else {
# redirect to login page if not in install mode
- RT::Interface::Web::redirect(Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/')
+ RT::Interface::Web::redirect(Jifty->web->url)
}
</%init>
Modified: rt/3.999/trunk/share/html/NoAuth/iCal/dhandler
==============================================================================
--- rt/3.999/trunk/share/html/NoAuth/iCal/dhandler (original)
+++ rt/3.999/trunk/share/html/NoAuth/iCal/dhandler Thu May 7 03:37:04 2009
@@ -94,7 +94,7 @@
my $start = Data::ICal::Entry::Event->new;
my $end = Data::ICal::Entry::Event->new;
$_->add_properties(
- url => Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' . "?q=".$t->id,
+ url => Jifty->web->url . "?q=".$t->id,
organizer => $t->owner_obj->name,
dtstamp => $now->iCal,
created => $t->created->iCal,
Modified: rt/3.999/trunk/share/html/Search/Elements/ResultViews
==============================================================================
--- rt/3.999/trunk/share/html/Search/Elements/ResultViews (original)
+++ rt/3.999/trunk/share/html/Search/Elements/ResultViews Thu May 7 03:37:04 2009
@@ -59,7 +59,7 @@
<ul class="search-result-views">
<li><a href="<%RT->config->get('web_path')%>/Search/Results.tsv<%$query_string%>"><&|/l&>Spreadsheet</&></a></li>
<li><a href="<%$rss_feed_url%>"><&|/l&>RSS</&></a></li>
-<li><a href="<%Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/'%>/NoAuth/iCal/<% $ical_path %>"><% _('iCal') %></a></li>
+<li><a href="<%Jifty->web->url%>/NoAuth/iCal/<% $ical_path %>"><% _('iCal') %></a></li>
<li><a href="<%RT->config->get('web_path')%>/Tools/Offline.html<%$short_query_string%>"><&|/l&>Editable text</&></a></li>
% # Now let callbacks add their extra tools
% $m->callback( %ARGS, callback_name => 'AfterTools' );
Modified: rt/3.999/trunk/share/html/Search/Results.rdf
==============================================================================
--- rt/3.999/trunk/share/html/Search/Results.rdf (original)
+++ rt/3.999/trunk/share/html/Search/Results.rdf Thu May 7 03:37:04 2009
@@ -68,7 +68,7 @@
my $rss = new XML::RSS (version => '1.0');
$rss->channel(
title => RT->config->get('rtname').": Search" . $ARGS{'Query'},
- link => Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/',
+ link => Jifty->web->url,
description => "",
dc => {
},
@@ -86,7 +86,7 @@
$creator_str =~ s/[\r\n]//g;
$rss->add_item(
title => $Ticket->subject || _('No Subject'),
- link => Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/'."Ticket/Display.html?id=".$Ticket->id,
+ link => Jifty->web->url."Ticket/Display.html?id=".$Ticket->id,
description => $Ticket->transactions->first->content,
dc => {
creator => $creator_str,
Modified: rt/3.999/trunk/share/html/Search/Simple.html
==============================================================================
--- rt/3.999/trunk/share/html/Search/Simple.html (original)
+++ rt/3.999/trunk/share/html/Search/Simple.html Thu May 7 03:37:04 2009
@@ -81,13 +81,13 @@
if ($q) {
my $tickets = RT::Model::TicketCollection->new(current_user => Jifty->web->current_user);
if ($q =~ /^#?(\d+)$/) {
- RT::Interface::Web::redirect(Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/'."Ticket/Display.html?id=".$1);
+ RT::Interface::Web::redirect(Jifty->web->url."Ticket/Display.html?id=".$1);
}
$m->callback( %ARGS, query => \$q, callback_name => 'ModifyQuery' );
if ($q =~ /^#?(\d+)$/) {
- RT::Interface::Web::redirect(Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/'."Ticket/Display.html?id=".$1);
+ RT::Interface::Web::redirect(Jifty->web->url."Ticket/Display.html?id=".$1);
}
my %args = (
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 Thu May 7 03:37:04 2009
@@ -212,7 +212,7 @@
# But we need to store Actions somewhere too, so we don't lose them.
my $key = Digest::MD5::md5_hex(rand(1024));
Jifty->web->session->set( "actions_$key" => \@Actions );
- RT::Interface::Web::redirect( Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' ."SelfService/Display.html?id=". $Ticket->id."&results=".$key);
+ RT::Interface::Web::redirect( Jifty->web->url ."SelfService/Display.html?id=". $Ticket->id."&results=".$key);
}
my $Transactions = $Ticket->transactions;
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 Thu May 7 03:37:04 2009
@@ -202,7 +202,7 @@
# But we need to store Actions somewhere too, so we don't lose them.
my $key = Digest::MD5::md5_hex( rand(1024) );
Jifty->web->session->set( "actions_$key" => \@Actions );
- RT::Interface::Web::redirect( Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' . "Ticket/Display.html?id=" . $ticket_obj->id . "&results=" . $key );
+ RT::Interface::Web::redirect( Jifty->web->url . "Ticket/Display.html?id=" . $ticket_obj->id . "&results=" . $key );
}
my $attachments = $m->comp('Elements/FindAttachments', ticket => $ticket_obj, tickets => $Tickets);
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 Thu May 7 03:37:04 2009
@@ -100,7 +100,7 @@
if ( $forward_and_return ) {
my $key = Digest::MD5::md5_hex(rand(1024));
Jifty->web->session->set( "actions_$key" => \@results );
- RT::Interface::Web::redirect( Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' ."Ticket/Display.html?id=". $id."&results=".$key);
+ RT::Interface::Web::redirect( Jifty->web->url ."Ticket/Display.html?id=". $id."&results=".$key);
}
}
Modified: rt/3.999/trunk/share/html/Ticket/GnuPG.html
==============================================================================
--- rt/3.999/trunk/share/html/Ticket/GnuPG.html (original)
+++ rt/3.999/trunk/share/html/Ticket/GnuPG.html Thu May 7 03:37:04 2009
@@ -56,7 +56,7 @@
% $m->callback( callback_name => 'BeforeActionList', %ARGS, actions => \@results, args_ref => \%ARGS );
<& /Elements/ListActions, actions => \@results &>
<form method="post" action="<% RT->config->get('web_path') . $m->request_comp->path %>?id=<% $id %>">
-<a href="<% Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/' %>Ticket/Display.html?id=<% $txn->ticket %>#txn-<% $id %>">
+<a href="<% Jifty->web->url %>Ticket/Display.html?id=<% $txn->ticket %>#txn-<% $id %>">
<% _('Return back to the ticket') %>
</a>
<& /Elements/Submit,
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 Thu May 7 03:37:04 2009
@@ -122,7 +122,7 @@
if ( $ARGS{'q'} ) {
- RT::Interface::Web::redirect(Jifty->config->framework('Web')->{BaseURL} . ':' . Jifty->config->framework('Web')->{Port} . '/'."Search/Simple.html?q=".$m->interp->apply_escapes($ARGS{q}));
+ RT::Interface::Web::redirect(Jifty->web->url."Search/Simple.html?q=".$m->interp->apply_escapes($ARGS{q}));
}
if ($ARGS{'home_refresh_interval'}) {
More information about the Rt-commit
mailing list