Skip to content

[issue_tracker] Fix typo & Cleanup close permission #9757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

[issue_tracker] Fix typo & Cleanup close permission #9757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
908738a
[issue_tracker] Fix typo & cleanup close permission
CamilleBeau Apr 16, 2025
332e14f
remove unused variable
CamilleBeau Apr 16, 2025
6b53035
typo
CamilleBeau Apr 16, 2025
48620d9
Fix logic
CamilleBeau May 13, 2025
50303dd
Merge branch '2025_04_16_Issue_tracker_cleanup' of https://github.com…
CamilleBeau May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 29 additions & 35 deletions modules/issue_tracker/php/edit.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,36 +142,6 @@ class Edit extends \NDB_Page implements ETagCalculator
}
}

// can't set to closed if no any of the persmissions.
$reporter = $db->pselectOne(
"SELECT reporter FROM issues WHERE IssueID=:issueID",
['issueID' => $values['issueID']]
);
$hasPartialAccess = $user->hasAnyPermission(
[
'issue_tracker_close_site_issue',
'issue_tracker_close_all_issue',
]
) || $reporter == $user->getUsername();
if ($hasPartialAccess) {
$statuses = [
'new' => 'New',
'acknowledged' => 'Acknowledged',
'assigned' => 'Assigned',
'feedback' => 'Feedback',
'resolved' => 'Resolved',
'closed' => 'Closed',
];
} else {
$statuses = [
'new' => 'New',
'acknowledged' => 'Acknowledged',
'assigned' => 'Assigned',
'feedback' => 'Feedback',
'resolved' => 'Resolved',
];
}

$priorities = [
'low' => 'Low',
'normal' => 'Normal',
Expand Down Expand Up @@ -201,14 +171,20 @@ class Edit extends \NDB_Page implements ETagCalculator

$instruments = \NDB_BVL_Instrument::getInstrumentNamesList($this->loris);

// Now get issue values
$issueData = $this->getIssueData(null, $user);
$issueData = $this->getIssueData(null, $user);
$isOwnIssue = $issueData['reporter']
== $this->formatUserInformation($user->getUsername());

if (!empty($values['issueID'])
&& $values['issueID'] != "new"
) { // if an existing issue
$issueID = intval($values['issueID']);
$issueData = $this->getIssueData($issueID, $user);

// Re-set isOwnIssue variable if not a new issue
$isOwnIssue = $issueData['reporter']
== $this->formatUserInformation($user->getUsername());

$provisioner = (new AttachmentProvisioner($issueID));
$attachments = (new \LORIS\Data\Table())
->withDataFrom($provisioner)
Expand Down Expand Up @@ -271,10 +247,28 @@ class Edit extends \NDB_Page implements ETagCalculator
// React is escaping the string in the template
// This fixes an issue with multiple escaping (#6643)
}
$issueData['comment'] = null;

$isOwnIssue = $issueData['reporter']
== $this->formatUserInformation($user->getUsername());
$statuses = [
'new' => 'New',
'acknowledged' => 'Acknowledged',
'assigned' => 'Assigned',
'feedback' => 'Feedback',
'resolved' => 'Resolved',
];

// Give "close" option if user has site close permissions and the issue
// is at a user site, or if the user has close permissions for all sites,
// or it is the user's own permission
if ($user->hasPermission('issue_tracker_close_all_issue')
|| ($user->hasPermission('issue_tracker_close_site_issue')
&& in_array($issueData['centerID'], $user->getCenterIDs()))
|| ($user->hasPermission('issue_tracker_own_issue')
&& $isOwnIssue)
) {
$statuses['closed'] = 'Closed';
}

$issueData['comment'] = null;

$result = [
'assignees' => $assignees,
Expand Down
4 changes: 2 additions & 2 deletions modules/issue_tracker/php/issue_tracker.class.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class Issue_Tracker extends \NDB_Menu_Filter_Form
$user = $factory->user();
$db = $factory->database();

$hasPartialAcess = !$user->hasAnyPermission(
$hasPartialAccess = !$user->hasAnyPermission(
[
'issue_tracker_all_issue',
'issue_tracker_site_issue',
Expand All @@ -130,7 +130,7 @@ class Issue_Tracker extends \NDB_Menu_Filter_Form
ON(i.reporter=u.UserID)",
[]
);
if ($hasPartialAcess) {
if ($hasPartialAccess) {
$reporter_expanded = $db->pselect(
"SELECT DISTINCT u.UserID,
u.Real_name
Expand Down
Loading