Skip to content

Commit 10e798e

Browse files
committed
Fix isReviewer in manage record menu
1 parent 02f7379 commit 10e798e

3 files changed

Lines changed: 21 additions & 376 deletions

File tree

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -320,10 +320,18 @@
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 scope.user.isAdmin() || scope.user.isReviewerForGroup(scope.md.groupOwner);
329+
};
330+
331+
scope.getWorkflowStepLabelKey = function (step) {
332+
return (
333+
step.from + "-to-" + step.to + "-" + (scope.isReviewer() ? "reviewer" : "editor")
334+
);
327335
};
328336

329337
scope.displayEnableWorkflowOption = function (user) {

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

Lines changed: 9 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,20 @@
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
116+
>&nbsp;
117+
<span
118+
>{{('mdStatusTitle-' + getWorkflowStepLabelKey(step)) | translate}}</span
119+
>
121120
</a>
122121
</li>
123122

0 commit comments

Comments
 (0)