From d695b1d38447edae0558829766726d9d99489689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= Date: Mon, 24 Apr 2017 15:36:57 +0200 Subject: Backport upstream bug 1128119: Add 'See Also' support for Phabricator --- extensions/MoreBugUrl/Extension.pm | 1 + extensions/MoreBugUrl/disabled | 0 extensions/MoreBugUrl/lib/Phabricator.pm | 41 ++++++++++++++++++++++ .../user-error-bug_url_invalid_tracker.html.tmpl | 1 + 4 files changed, 43 insertions(+) delete mode 100644 extensions/MoreBugUrl/disabled create mode 100644 extensions/MoreBugUrl/lib/Phabricator.pm diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm index 18507f8d1..0a4223e19 100644 --- a/extensions/MoreBugUrl/Extension.pm +++ b/extensions/MoreBugUrl/Extension.pm @@ -22,6 +22,7 @@ use constant MORE_SUB_CLASSES => qw( Bugzilla::Extension::MoreBugUrl::PHP Bugzilla::Extension::MoreBugUrl::Redmine Bugzilla::Extension::MoreBugUrl::Savane + Bugzilla::Extension::MoreBugUrl::Phabricator ); # We need to update bug_see_also table because both diff --git a/extensions/MoreBugUrl/disabled b/extensions/MoreBugUrl/disabled deleted file mode 100644 index e69de29bb..000000000 diff --git a/extensions/MoreBugUrl/lib/Phabricator.pm b/extensions/MoreBugUrl/lib/Phabricator.pm new file mode 100644 index 000000000..818d9af8f --- /dev/null +++ b/extensions/MoreBugUrl/lib/Phabricator.pm @@ -0,0 +1,41 @@ +# 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::Extension::MoreBugUrl::Phabricator; + +use 5.10.1; +use strict; +use warnings; + +use parent qw(Bugzilla::BugUrl); + +############################### +#### Methods #### +############################### + +sub should_handle { + my ($class, $uri) = @_; + return ($uri->path =~ m|^/T\d+$|) ? 1 : 0; +} + +sub _check_value { + my $class = shift; + + my $uri = $class->SUPER::_check_value(@_); + + # Phabricator URLs have only one form: + # http://example.com/T111 + + # 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/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl index 7e544ef21..2ac6f89a5 100644 --- a/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl +++ b/extensions/MoreBugUrl/template/en/default/hook/global/user-error-bug_url_invalid_tracker.html.tmpl @@ -14,3 +14,4 @@
  • A b[% %]ug on b[% %]ugs.php.net.
  • An issue in a Redmine installation.
  • A b[% %]ug in a Savane installation.
  • +
  • A task in a Phabricator installation.
  • -- cgit v1.2.1