summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Bug.pm
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2012-11-26 20:20:29 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2012-11-26 20:20:29 +0100
commit46e5d925026ccde28118bfcf28061c75f188b066 (patch)
treed9d95ff2e945ba67f1b8368cc33d24e38cd5dc6f /Bugzilla/Bug.pm
parentccf2d3e5e476ce72cb95894b68358950bfa1d24b (diff)
downloadbugzilla-46e5d925026ccde28118bfcf28061c75f188b066.tar.gz
bugzilla-46e5d925026ccde28118bfcf28061c75f188b066.tar.xz
Bug 718289: The deadline field should be visible by non-members of the timetracking group
r=dkl a=LpSolit
Diffstat (limited to 'Bugzilla/Bug.pm')
-rw-r--r--Bugzilla/Bug.pm11
1 files changed, 5 insertions, 6 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index b72a8fcdb..7a3ec4c8a 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -3734,9 +3734,7 @@ sub editable_bug_fields {
# Custom multi-select fields are not stored in the bugs table.
splice(@fields, $location, 1) if ($location > -1);
}
- # Sorted because the old @::log_columns variable, which this replaces,
- # was sorted.
- return sort(@fields);
+ return @fields;
}
# XXX - When Bug::update() will be implemented, we should make this routine
@@ -4048,9 +4046,10 @@ sub check_can_change_field {
# $PrivilegesRequired = PRIVILEGES_REQUIRED_REPORTER : the reporter, assignee or an empowered user;
# $PrivilegesRequired = PRIVILEGES_REQUIRED_ASSIGNEE : the assignee or an empowered user;
# $PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED : an empowered user.
-
- # Only users in the time-tracking group can change time-tracking fields.
- if ( grep($_ eq $field, TIMETRACKING_FIELDS) ) {
+
+ # Only users in the time-tracking group can change time-tracking fields,
+ # including the deadline.
+ if (grep { $_ eq $field } (TIMETRACKING_FIELDS, 'deadline')) {
if (!$user->is_timetracker) {
$$PrivilegesRequired = PRIVILEGES_REQUIRED_EMPOWERED;
return 0;