Skip to content

Fix isReviewer in manage record menu #9271

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

Merged
josegar74 merged 2 commits into from
May 9, 2026
Merged

Fix isReviewer in manage record menu #9271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54a909c
Fix isReviewer in manage record menu
tylerjmchugh May 7, 2026
cbc8cea
Fix js error and method parameters
tylerjmchugh May 8, 2026
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
28 changes: 23 additions & 5 deletions web-ui/src/main/resources/catalog/components/toolbar/ToolbarDirective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
return true;
}

var statusEffects = scope.getStatusEffects(user);
var statusEffects = scope.getStatusEffects();
for (var i = 0; i < statusEffects.length; i++) {
if (scope.displayWorkflowStepOption(statusEffects[i], user)) {
return true;
Expand All @@ -320,10 +320,28 @@
return false;
};

scope.getStatusEffects = function (user) {
var isReviewer =
user.isAdmin() || user.isReviewerForGroup(scope.md.groupOwner);
return scope.statusEffects[isReviewer ? "reviewer" : "editor"];
scope.getStatusEffects = function () {
Copy link
Copy Markdown
Member

@josegar74 josegar74 May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please check https://github.com/geonetwork/core-geonetwork/pull/9271/changes#diff-2a3359d9bd35129adf44d18ec994584f8e22dbfaf3e41dcb1b58cb87b47b1547L313, it still calls the method with the user parameter.

Copy link
Copy Markdown
Contributor Author

@tylerjmchugh tylerjmchugh May 8, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in latest push

return scope.statusEffects[scope.isReviewer() ? "reviewer" : "editor"];
};

scope.isReviewer = function () {
return (
scope.user &&
(scope.user.isAdmin() ||
(scope.md &&
scope.md.groupOwner &&
scope.user.isReviewerForGroup(scope.md.groupOwner)))
);
};

scope.getWorkflowStepLabelKey = function (step) {
return (
step.from +
"-to-" +
step.to +
"-" +
(scope.isReviewer() ? "reviewer" : "editor")
);
};

scope.displayEnableWorkflowOption = function (user) {
Expand Down
16 changes: 6 additions & 10 deletions web-ui/src/main/resources/catalog/components/toolbar/partials/menu-manage-record.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,7 @@
<span data-translate="" class="hidden-xs">manageRecord</span>
<span class="caret"></span>
</button>
<ul
class="dropdown-menu"
role="menu"
data-ng-init="isReviewer = user.isAdmin() || user.isReviewerForGroup(md.groupOwner);"
>
<ul class="dropdown-menu" role="menu">
<li role="menuitem" data-ng-if="showBatchDropdown">
<label>
<input
Expand Down Expand Up @@ -107,17 +103,17 @@
</a>
</li>
<li
data-ng-repeat="step in getStatusEffects(user)"
data-ng-repeat="step in getStatusEffects()"
data-ng-show="displayWorkflowStepOption(step, user)"
>
<a
href=""
data-ng-init="stepLabelKey = step.from + '-to-' + step.to + '-' + (isReviewer ? 'reviewer' : 'editor')"
data-ng-click="mdService.openUpdateStatusPanel(
getScope(), 'workflow', null, status[step.to], stepLabelKey)"
getScope(), 'workflow', null, status[step.to],
getWorkflowStepLabelKey(step))"
>
<span class="fa fa-fw gn-status-{{stepLabelKey}}"></span>&nbsp;
<span>{{('mdStatusTitle-' + stepLabelKey) | translate}}</span>
<span class="fa fa-fw gn-status-{{getWorkflowStepLabelKey(step)}}"></span>&nbsp;
<span>{{('mdStatusTitle-' + getWorkflowStepLabelKey(step)) | translate}}</span>
</a>
</li>

Expand Down
Loading
Loading