From e330e0c5d27ad77ca2c9839609cbf88ffd4efef9 Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Wed, 25 Jan 2012 18:19:51 -0200 Subject: Bug 617802: Add see also support for Rietveld installations on appspot.com r=timello, a=LpSolit --- Bugzilla/BugUrl.pm | 1 + Bugzilla/BugUrl/Rietveld.pm | 45 +++++++++++++++++++++++++ template/en/default/global/user-error.html.tmpl | 1 + 3 files changed, 47 insertions(+) create mode 100644 Bugzilla/BugUrl/Rietveld.pm diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm index 1272b55fa..99d46bd24 100644 --- a/Bugzilla/BugUrl.pm +++ b/Bugzilla/BugUrl.pm @@ -57,6 +57,7 @@ use constant SUB_CLASSES => qw( Bugzilla::BugUrl::MantisBT Bugzilla::BugUrl::SourceForge Bugzilla::BugUrl::ReviewBoard + Bugzilla::BugUrl::Rietveld ); ############################### diff --git a/Bugzilla/BugUrl/Rietveld.pm b/Bugzilla/BugUrl/Rietveld.pm new file mode 100644 index 000000000..9baf85d8d --- /dev/null +++ b/Bugzilla/BugUrl/Rietveld.pm @@ -0,0 +1,45 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. + +package Bugzilla::BugUrl::Rietveld; +use strict; +use base qw(Bugzilla::BugUrl); + +############################### +#### Methods #### +############################### + +sub should_handle { + my ($class, $uri) = @_; + return ($uri->authority =~ /\.appspot\.com$/i + and $uri->path =~ m#^/\d+(?:/|/show)?$#) ? 1 : 0; +} + +sub _check_value { + my ($class, $uri) = @_; + + $uri = $class->SUPER::_check_value($uri); + + # Rietveld URLs have three forms: + # http(s)://example.appspot.com/1234 + # http(s)://example.appspot.com/1234/ + # http(s)://example.appspot.com/1234/show + if ($uri->path =~ m#^/(\d+)(?:/|/show)$#) { + # This is the shortest standard URL form for Rietveld issues, + # and so we reduce all URLs to this. + $uri->path('/' . $1); + } + + # Make sure there are no query parameters. + $uri->query(undef); + # And remove any # part if there is one. + $uri->fragment(undef); + + return $uri; +} + +1; diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 8dbaa4ad4..f5274b8bd 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -255,6 +255,7 @@
  • A b[% %]ug in a MantisBT installation.
  • A b[% %]ug on sourceforge.net.
  • A Review Board review request.
  • +
  • An issue in a Rietveld installation.
  • [% ELSIF reason == 'id' %] There is no valid [% terms.bug %] id in that URL. -- cgit v1.2.3-24-g4f1b