Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Rename field
  • Loading branch information
Damir Mustafin authored and Damir Mustafin committed Sep 28, 2016
commit 808e4280aed1f49cf263458304c3c83b25bed800
6 changes: 3 additions & 3 deletions apis/collection/server/permissions.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ Apis.allow({

try {
// Get access setting value
const onlyAdminsCanAddApi = settings.access.onlyAdminsCanAddApi;
const onlyAdminsCanAddApis = settings.access.onlyAdminsCanAddApis;

if (!onlyAdminsCanAddApi) {
if (!onlyAdminsCanAddApis) {
return true;
}

// Check if current user is admin
const userIsAdmin = Roles.userIsInRole(userId, ['admin']);

// Check if current user is admin and access settings is set
return onlyAdminsCanAddApi && userIsAdmin;
return onlyAdminsCanAddApis && userIsAdmin;
} catch (e) {
// If caught an error, then returning true because no access settings is set
// By default allowing all user to add an API
Expand Down
6 changes: 3 additions & 3 deletions core/client/navbar/navbar.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,9 @@ Template.navbar.helpers({
const settings = Settings.findOne();

// Get access setting value
const onlyAdminsCanAddApi = settings.access.onlyAdminsCanAddApi;
const onlyAdminsCanAddApis = settings.access.onlyAdminsCanAddApis;

if (!onlyAdminsCanAddApi) {
if (!onlyAdminsCanAddApis) {
return true;
}

Expand All @@ -101,7 +101,7 @@ Template.navbar.helpers({
// Check if current user is admin
const userIsAdmin = Roles.userIsInRole(userId, ['admin']);

return onlyAdminsCanAddApi && userIsAdmin;
return onlyAdminsCanAddApis && userIsAdmin;
} catch (e) {
// If caught an error, then returning true because no access settings is set
// By default allowing all user to add an API
Expand Down
2 changes: 1 addition & 1 deletion settings/client/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<span class="panel-title">{{ _ "settings_addingApis" }}</span>
</div>
<div class="panel-body">
{{> afQuickField name='access.onlyAdminsCanAddApi'}}
{{> afQuickField name='access.onlyAdminsCanAddApis'}}
</div>
</div>
<div class="panel panel-default">
Expand Down
2 changes: 1 addition & 1 deletion settings/collection/schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Settings.schema = new SimpleSchema({
type: Object,
optional: true,
},
'access.onlyAdminsCanAddApi': {
'access.onlyAdminsCanAddApis': {
type: Boolean,
optional: true,
label: TAPi18n.__('settings_schema_onlyAdminsCanAddApis'),
Expand Down