Skip to content

Commit d94418d

Browse files
committed
Apply requested changes
1 parent 8f965ac commit d94418d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

jsapp/js/router/allRoutes.es6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ const AllRoutes = class AllRoutes extends React.Component {
383383
<PermProtectedRoute
384384
protectedComponent={FormSubScreens}
385385
requiredPermissions={[PERMISSIONS_CODENAMES.change_asset, PERMISSIONS_CODENAMES.view_submissions]}
386-
requireAll={true}
386+
requireAll
387387
/>
388388
}
389389
/>

jsapp/js/router/permProtectedRoute.es6

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ class PermProtectedRoute extends React.Component {
7777
isLoadAssetFinished: true,
7878
userHasRequiredPermissions: this.getUserHasRequiredPermissions(
7979
asset,
80-
this.props.requiredPermissions
80+
this.props.requiredPermissions,
81+
this.props.requireAll
8182
),
8283
});
8384
}
@@ -102,7 +103,7 @@ class PermProtectedRoute extends React.Component {
102103
);
103104
}
104105

105-
getUserHasRequiredPermissions(asset, requiredPermissions, all) {
106+
getUserHasRequiredPermissions(asset, requiredPermissions, all = false) {
106107
if (all) {
107108
return requiredPermissions.every((perm) => this.getUserHasRequiredPermission(asset, perm));
108109
} else {

0 commit comments

Comments
 (0)