Skip to content

Commit d1334bd

Browse files
authored
Fix isReviewer in manage record menu (#9271)
* Fix isReviewer in manage record menu * Fix js error and method parameters
1 parent 3772614 commit d1334bd

3 files changed

Lines changed: 29 additions & 377 deletions

File tree

web-ui/src/main/resources/catalog/components/toolbar/ToolbarDirective.js

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@
310310
return true;
311311
}
312312

313-
var statusEffects = scope.getStatusEffects(user);
313+
var statusEffects = scope.getStatusEffects();
314314
for (var i = 0; i < statusEffects.length; i++) {
315315
if (scope.displayWorkflowStepOption(statusEffects[i], user)) {
316316
return true;
@@ -320,10 +320,28 @@
320320
return false;
321321
};
322322

323-
scope.getStatusEffects = function (user) {
324-
var isReviewer =
325-
user.isAdmin() || user.isReviewerForGroup(scope.md.groupOwner);
326-
return scope.statusEffects[isReviewer ? "reviewer" : "editor"];
323+
scope.getStatusEffects = function () {
324+
return scope.statusEffects[scope.isReviewer() ? "reviewer" : "editor"];
325+
};
326+
327+
scope.isReviewer = function () {
328+
return (
329+
scope.user &&
330+
(scope.user.isAdmin() ||
331+
(scope.md &&
332+
scope.md.groupOwner &&
333+
scope.user.isReviewerForGroup(scope.md.groupOwner)))
334+
);
335+
};
336+
337+
scope.getWorkflowStepLabelKey = function (step) {
338+
return (
339+
step.from +
340+
"-to-" +
341+
step.to +
342+
"-" +
343+
(scope.isReviewer() ? "reviewer" : "editor")
344+
);
327345
};
328346

329347
scope.displayEnableWorkflowOption = function (user) {

web-ui/src/main/resources/catalog/components/toolbar/partials/menu-manage-record.html

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,7 @@
1212
<span data-translate="" class="hidden-xs">manageRecord</span>
1313
<span class="caret"></span>
1414
</button>
15-
<ul
16-
class="dropdown-menu"
17-
role="menu"
18-
data-ng-init="isReviewer = user.isAdmin() || user.isReviewerForGroup(md.groupOwner);"
19-
>
15+
<ul class="dropdown-menu" role="menu">
2016
<li role="menuitem" data-ng-if="showBatchDropdown">
2117
<label>
2218
<input
@@ -107,17 +103,17 @@
107103
</a>
108104
</li>
109105
<li
110-
data-ng-repeat="step in getStatusEffects(user)"
106+
data-ng-repeat="step in getStatusEffects()"
111107
data-ng-show="displayWorkflowStepOption(step, user)"
112108
>
113109
<a
114110
href=""
115-
data-ng-init="stepLabelKey = step.from + '-to-' + step.to + '-' + (isReviewer ? 'reviewer' : 'editor')"
116111
data-ng-click="mdService.openUpdateStatusPanel(
117-
getScope(), 'workflow', null, status[step.to], stepLabelKey)"
112+
getScope(), 'workflow', null, status[step.to],
113+
getWorkflowStepLabelKey(step))"
118114
>
119-
<span class="fa fa-fw gn-status-{{stepLabelKey}}"></span>&nbsp;
120-
<span>{{('mdStatusTitle-' + stepLabelKey) | translate}}</span>
115+
<span class="fa fa-fw gn-status-{{getWorkflowStepLabelKey(step)}}"></span>&nbsp;
116+
<span>{{('mdStatusTitle-' + getWorkflowStepLabelKey(step)) | translate}}</span>
121117
</a>
122118
</li>
123119

0 commit comments

Comments
 (0)