Bug 661533: The See Also field should support Review Board URLs

r=timello a=LpSolit

diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm
index 347d8d2324aa8fe2445a54bf7a3f12ab89e93e30..91c989c84876137d87b917ac9495d9fd19a22fa6 100644 (file)
--- a/Bugzilla/BugUrl.pm
+++ b/Bugzilla/BugUrl.pm
@@ -65,6 +65,7 @@ use constant SUB_CLASSES => qw(
     Bugzilla::BugUrl::Trac
     Bugzilla::BugUrl::MantisBT
     Bugzilla::BugUrl::SourceForge
+    Bugzilla::BugUrl::ReviewBoard
 );
 
 ###############################

diff --git a/Bugzilla/BugUrl/ReviewBoard.pm b/Bugzilla/BugUrl/ReviewBoard.pm
new file mode 100644 (file)
index 0000000..01d932f
--- /dev/null
+++ b/Bugzilla/BugUrl/ReviewBoard.pm
@@ -0,0 +1,55 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Matt Selsky
+# Portions created by Matt Selsky are Copyright (C) 2011
+# Matt Selsky. All Rights Reserved.
+#
+# Contributor(s): Matt Selsky <selsky@columbia.edu>
+
+package Bugzilla::BugUrl::ReviewBoard;
+use strict;
+use base qw(Bugzilla::BugUrl);
+
+###############################
+####        Methods        ####
+###############################
+
+sub should_handle {
+    my ($class, $uri) = @_;
+    return ($uri->path =~ m|/r/\d+/?$|) ? 1 : 0;
+}
+
+sub _check_value {
+    my $class = shift;
+
+    my $uri = $class->SUPER::_check_value(@_);
+
+    # Review Board URLs have only one form (the trailing slash is optional):
+    #   http://reviews.reviewboard.org/r/111/
+
+    # Make sure there are no query parameters.
+    $uri->query(undef);
+    # And remove any # part if there is one.
+    $uri->fragment(undef);
+
+    # make sure the trailing slash is present
+    if ($uri->path !~ m|/$|) {
+        $uri->path($uri->path . '/');
+    }
+
+    return $uri;
+}
+
+1;

diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 57374a566c7cd363f6ec418139b8483716952b65..68764b22f73850ca47eec59fbdcddc1537863222 100644 (file)
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -268,6 +268,7 @@
         <li>A ticket in a Trac installation.</li>
         <li>A b[% %]ug in a MantisBT installation.</li>
         <li>A b[% %]ug on sourceforge.net.</li>
+        <li>A Review Board review request.</li>
       </ul>
     [% ELSIF reason == 'id' %]
       There is no valid [% terms.bug %] id in that URL.