[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-229-g74507be
Thomas Sibley
trs at bestpractical.com
Thu Oct 28 11:30:45 EDT 2010
The branch, 3.9-trunk has been updated
via 74507be473de5473da1e1222a63dcfebb453d404 (commit)
via 63287a700e512ba42cdca2eb63ccad346173d7f7 (commit)
from 6693d6c81d768808f82b98d1bb689d437f2774f8 (commit)
Summary of changes:
share/html/Elements/Login | 2 +-
share/html/Ticket/Display.html | 3 ++-
share/html/m/ticket/show | 4 ++++
3 files changed, 7 insertions(+), 2 deletions(-)
- Log -----------------------------------------------------------------
commit 63287a700e512ba42cdca2eb63ccad346173d7f7
Author: Thomas Sibley <trs at bestpractical.com>
Date: Thu Oct 28 11:11:04 2010 -0400
Kill spaces that snuck into the mobile login component path
diff --git a/share/html/Elements/Login b/share/html/Elements/Login
index 01b09e1..0855a92 100755
--- a/share/html/Elements/Login
+++ b/share/html/Elements/Login
@@ -54,7 +54,7 @@ if ( $m->request_comp->path =~ '^/REST/\d+\.\d+/' ) {
$m->abort;
} elsif ( RT::Interface::Web->MobileClient()
|| ( $m->request_comp->path() =~ m{^/m(?:\/|$)} ) ) {
- $m->comp( '/m / login ', %ARGS );
+ $m->comp( '/m/login', %ARGS );
$m->abort;
}
commit 74507be473de5473da1e1222a63dcfebb453d404
Author: Thomas Sibley <trs at bestpractical.com>
Date: Thu Oct 28 11:29:55 2010 -0400
Redirect to the right path and with an actual ticket id
diff --git a/share/html/Ticket/Display.html b/share/html/Ticket/Display.html
index 43e834a..5c52eb1 100755
--- a/share/html/Ticket/Display.html
+++ b/share/html/Ticket/Display.html
@@ -102,7 +102,8 @@ $Collapsed => undef
$m->callback( TicketObj => $TicketObj, ARGSRef => \%ARGS, CallbackName => 'Initial' );
if ( ! $ARGS{'NoRedirect'} && RT::Interface::Web->MobileClient()) {
- RT::Interface::Web::Redirect(RT->Config->Get('WebURL').'/m/ticket/show.html?id='.$TicketObj->id);
+ $id ||= $TicketObj->id if $TicketObj;
+ RT::Interface::Web::Redirect(RT->Config->Get('WebURL').'/m/ticket/show?id='.$id);
$m->abort;
}
diff --git a/share/html/m/ticket/show b/share/html/m/ticket/show
index fa7b822..96e7512 100644
--- a/share/html/m/ticket/show
+++ b/share/html/m/ticket/show
@@ -52,6 +52,10 @@ $id => undef
my $Ticket;
my @Actions;
+unless ($id) {
+ Abort('No ticket specified');
+}
+
if ($ARGS{'id'} eq 'new') {
# {{{ Create a new ticket
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list