[Bps-public-commit] rt-extension-mobileui branch, master, updated. 0.96-5-g8b2998f

[Thomas Sibley]

The branch, master has been updated
       via  8b2998f9db1554327a7b78cd945e0e830458aeb0 (commit)
      from  ba4193662de0b7d56a8c63cb3c9267b602cb898e (commit)

Summary of changes:
 .../Ticket/Display.html/Initial                    |    2 +-
 html/m/_elements/ticket_list                       |    2 +-
 html/m/login                                       |    2 +-
 html/m/logout                                      |    2 +-
 html/m/ticket/show                                 |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 8b2998f9db1554327a7b78cd945e0e830458aeb0
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Oct 29 09:43:44 2010 -0400

    $WebURL already has a trailing slash, so don't double it

diff --git a/html/Callbacks/RT-Extension-MobileUI/Ticket/Display.html/Initial b/html/Callbacks/RT-Extension-MobileUI/Ticket/Display.html/Initial
index 2fe6ba4..1ecb2bd 100644
--- a/html/Callbacks/RT-Extension-MobileUI/Ticket/Display.html/Initial
+++ b/html/Callbacks/RT-Extension-MobileUI/Ticket/Display.html/Initial
@@ -2,7 +2,7 @@
 return if $ARGSRef->{'NoRedirect'};
 if (RT::Extension::MobileUI::MobileClient()) {
     my $id = $ARGSRef->{'id'} || ($TicketObj ? $TicketObj->id : undef);
-    RT::Interface::Web::Redirect(RT->Config->Get('WebURL').'/m/ticket/show?id='.$id);
+    RT::Interface::Web::Redirect(RT->Config->Get('WebURL').'m/ticket/show?id='.$id);
     $m->abort;
 }
 </%INIT>
diff --git a/html/m/_elements/ticket_list b/html/m/_elements/ticket_list
index 43a54c6..822efe8 100644
--- a/html/m/_elements/ticket_list
+++ b/html/m/_elements/ticket_list
@@ -25,7 +25,7 @@ if ( $order_by) {
 $collection->RedoSearch();
  
 if ($page > 1 && ! @{$collection->ItemsArrayRef||[]}) {
-    RT::Interface::Web::Redirect( RT->Config->Get('WebURL')."/m/tickets/search?page=".($page-1)."&query=".$query."&order=$order&order_by=$order_by");
+    RT::Interface::Web::Redirect( RT->Config->Get('WebURL')."m/tickets/search?page=".($page-1)."&query=".$query."&order=$order&order_by=$order_by");
 }
 
 </%init>
diff --git a/html/m/login b/html/m/login
index 3688749..af7f67a 100644
--- a/html/m/login
+++ b/html/m/login
@@ -23,7 +23,7 @@ unless (!defined($uri->scheme) || $uri->scheme eq 'http' || $uri->scheme eq 'htt
 
 # Make sure we're logging in to the same domain
 # You can get an undef authority with a relative uri like "index.html"
-my $uri_base_url = URI->new(RT->Config->Get('WebURL')."/m/");
+my $uri_base_url = URI->new(RT->Config->Get('WebURL')."m/");
 unless (!defined($uri->authority) || $uri->authority eq $uri_base_url->authority) {
     $form_action = $default_path;
 }
diff --git a/html/m/logout b/html/m/logout
index 78878a3..3006ea8 100644
--- a/html/m/logout
+++ b/html/m/logout
@@ -3,5 +3,5 @@ if (keys %session) {
     tied(%session)->delete;
     $session{'CurrentUser'} = RT::CurrentUser->new;
 }
-RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."/m");
+RT::Interface::Web::Redirect(RT->Config->Get('WebURL')."m/");
 </%init>
diff --git a/html/m/ticket/show b/html/m/ticket/show
index ed70047..1049ff5 100644
--- a/html/m/ticket/show
+++ b/html/m/ticket/show
@@ -96,7 +96,7 @@ if (@Actions) {
     my $key = Digest::MD5::md5_hex( rand(1024) );
     push @{ $session{"Actions"}->{$key} ||= [] }, @Actions;
     $session{'i'}++;
-    my $url = RT->Config->Get('WebURL') . "/m/ticket/show?id=" . $Ticket->id . "&results=" . $key;
+    my $url = RT->Config->Get('WebURL') . "m/ticket/show?id=" . $Ticket->id . "&results=" . $key;
     $url .= '#' . $ARGS{Anchor} if $ARGS{Anchor};
     RT::Interface::Web::Redirect($url);
 }

-----------------------------------------------------------------------