diff options
author | Matt Selsky <selsky@columbia.edu> | 2012-05-07 11:57:31 -0300 |
---|---|---|
committer | Tiago Mello <timello@gmail.com> | 2012-05-07 11:57:31 -0300 |
commit | 4e5dcf363dd1ffa63f0d7a190fa61891061ddea2 (patch) | |
tree | 53c0216debd37b12c8ba2c82b76f054f3ee304a5 | |
parent | 8837967f9754641c7cf4a9bf2a5bc6e73244df15 (diff) | |
download | bugs-4e5dcf363dd1ffa63f0d7a190fa61891061ddea2.tar bugs-4e5dcf363dd1ffa63f0d7a190fa61891061ddea2.tar.gz bugs-4e5dcf363dd1ffa63f0d7a190fa61891061ddea2.tar.bz2 bugs-4e5dcf363dd1ffa63f0d7a190fa61891061ddea2.tar.xz bugs-4e5dcf363dd1ffa63f0d7a190fa61891061ddea2.zip |
Bug 571740: Add support for getsatisfaction for the See Also field
r=timello, a=LpSolit
5 files changed, 43 insertions, 5 deletions
diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm index c48a33378..8689e8a35 100644 --- a/Bugzilla/BugUrl.pm +++ b/Bugzilla/BugUrl.pm @@ -133,8 +133,7 @@ sub class_for { if $subclass->should_handle($uri); } - ThrowUserError('bug_url_invalid', { url => $value, - reason => 'show_bug' }); + ThrowUserError('bug_url_invalid', { url => $value }); } sub _check_class { diff --git a/extensions/MoreBugUrl/Extension.pm b/extensions/MoreBugUrl/Extension.pm index 1ec2fcf16..03a5ab608 100644 --- a/extensions/MoreBugUrl/Extension.pm +++ b/extensions/MoreBugUrl/Extension.pm @@ -13,6 +13,7 @@ use constant MORE_SUB_CLASSES => qw( Bugzilla::Extension::MoreBugUrl::ReviewBoard Bugzilla::Extension::MoreBugUrl::Rietveld Bugzilla::Extension::MoreBugUrl::RT + Bugzilla::Extension::MoreBugUrl::GetSatisfaction ); # We need to update bug_see_also table because both diff --git a/extensions/MoreBugUrl/lib/GetSatisfaction.pm b/extensions/MoreBugUrl/lib/GetSatisfaction.pm new file mode 100644 index 000000000..ff63b10e1 --- /dev/null +++ b/extensions/MoreBugUrl/lib/GetSatisfaction.pm @@ -0,0 +1,37 @@ +# 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::GetSatisfaction; +use strict; +use base qw(Bugzilla::BugUrl); + +############################### +#### Methods #### +############################### + +sub should_handle { + my ($class, $uri) = @_; + + # GetSatisfaction URLs only have one form: + # http(s)://getsatisfaction.com/PROJECT_NAME/topics/TOPIC_NAME + return ($uri->authority =~ /^getsatisfaction.com$/i + and $uri->path =~ m|^/[^/]+/topics/[^/]+$|) ? 1 : 0; +} + +sub _check_value { + my ($class, $uri) = @_; + + $uri = $class->SUPER::_check_value($uri); + + # GetSatisfaction HTTP URLs redirect to HTTPS, so just use the HTTPS + # scheme. + $uri->scheme('https'); + + 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 979a9d5dd..60d662034 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 @@ -9,3 +9,4 @@ <li>A Review Board review request.</li> <li>An issue in a Rietveld installation.</li> <li>A ticket in an RT installation.</li> +<li>A topic on getsatisfaction.com.</li> diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl index 72d0241a0..eb77420f0 100644 --- a/template/en/default/global/user-error.html.tmpl +++ b/template/en/default/global/user-error.html.tmpl @@ -242,7 +242,9 @@ URLs must start with "http" or "https". [% ELSIF reason == 'path_only' %] You must specify a full URL. - [% ELSIF reason == 'show_bug' %] + [% ELSIF reason == 'id' %] + There is no valid [% terms.bug %] id in that URL. + [% ELSE %] [%+ field_descs.see_also FILTER html %] URLs should point to one of: <ul> <li><code>show_bug.cgi</code> in a [% terms.Bugzilla %] @@ -257,8 +259,6 @@ <li>An issue on github.com.</li> [% Hook.process('bug_url_invalid_tracker') %] </ul> - [% ELSIF reason == 'id' %] - There is no valid [% terms.bug %] id in that URL. [% END %] [% ELSIF error == "bug_url_too_long" %] |