Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Are you sure you want to check in on branch master

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@265684 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-11-24 17:16:38 +00:00
parent a09b8a9850
commit 2bb9936be8
6 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
9217
9218

2
mozilla/webtools/bugzilla/.gitrev
View File

@ -1 +1 @@
82674d427a9b6f210347279dbb74da631f3d57cb
9e1efb5e001b8540672f42bfd7101fed4a394c0e

21
mozilla/webtools/bugzilla/Bugzilla/BugUrl/SourceForge.pm
View File

@ -22,12 +22,18 @@ sub should_handle {
# SourceForge tracker URLs have only one form:
# http://sourceforge.net/tracker/?func=detail&aid=111&group_id=111&atid=111
# SourceForge Allura ticket URLs have several forms:
# http://sourceforge.net/p/project/bugs/12345/
# http://sourceforge.net/p/project/feature-requests/12345/
# http://sourceforge.net/p/project/patches/12345/
# http://sourceforge.net/p/project/support-requests/12345/
return (lc($uri->authority) eq 'sourceforge.net'
and $uri->path =~ m|/tracker/|
and $uri->query_param('func') eq 'detail'
and $uri->query_param('aid')
and $uri->query_param('group_id')
and $uri->query_param('atid')) ? 1 : 0;
and (($uri->path eq '/tracker/'
and $uri->query_param('func') eq 'detail'
and $uri->query_param('aid')
and $uri->query_param('group_id')
and $uri->query_param('atid'))
or $uri->path =~ m!^/p/[^/]+/(?:bugs|feature-requests|patches|support-requests)/\d+/?$!)) ? 1 : 0;
}
sub _check_value {
@ -38,6 +44,11 @@ sub _check_value {
# Remove any # part if there is one.
$uri->fragment(undef);
# Make sure the trailing slash is present
my $path = $uri->path;
$path =~ s!/*$!/!;
$uri->path($path);
return $uri;
}

6
mozilla/webtools/bugzilla/Bugzilla/Install.pm
View File

@ -135,11 +135,13 @@ use constant SYSTEM_GROUPS => (
},
{
name => 'bz_canusewhineatothers',
description => 'Can configure whine reports for other users',
description => 'Can configure queries and schedules for periodic'
. ' reports to be run and sent via email to other users and groups',
},
{
name => 'bz_canusewhines',
description => 'User can configure whine reports for self',
description => 'Can configure queries and schedules for periodic'
. ' reports to be run and sent via email to themselves',
# inherited_by means that users in the groups listed below are
# automatically members of bz_canusewhines.
inherited_by => ['editbugs', 'bz_canusewhineatothers'],

11
mozilla/webtools/bugzilla/Bugzilla/Install/DB.pm
View File

@ -730,6 +730,17 @@ sub update_table_definitions {
$dbh->bz_add_column('longdescs', 'is_markdown',
{TYPE => 'BOOLEAN', NOTNULL => 1, DEFAULT => 'FALSE'});
$dbh->do('UPDATE groups SET description = ? WHERE name = ? and description = ?',
undef,
"Can configure queries and schedules for periodic reports to be run and sent via email to other users and groups",
"bz_canusewhineatothers",
"Can configure whine reports for other users");
$dbh->do('UPDATE groups SET description = ? WHERE name = ? and description = ?',
undef,
"Can configure queries and schedules for periodic reports to be run and sent via email to themselves",
"bz_canusewhines",
"User can configure whine reports for self");
################################################################
# New --TABLE-- changes should go *** A B O V E *** this point #
################################################################

2
mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
View File

@ -291,7 +291,7 @@
<li>An issue in a JIRA installation.</li>
<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 b[% %]ug or ticket on sourceforge.net.</li>
<li>An issue/pull request on github.com.</li>
[% Hook.process('bug_url_invalid_tracker') %]
</ul>