viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

ability to disable scope

Browse Source
This commit is contained in:
yuri
2015-12-03 12:42:25 +02:00
parent 2c4ba8c1b5
commit d3b50c077b
27 changed files with 245 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/Espo/Controllers/EntityManager.php
View File

@@ -69,6 +69,9 @@ class EntityManager extends \Espo\Core\Controllers\Base
if (!empty($data['stream'])) {
$params['stream'] = $data['stream'];
}
if (!empty($data['disabled'])) {
$params['disabled'] = $data['disabled'];
}
if (!empty($data['sortBy'])) {
$params['sortBy'] = $data['sortBy'];
}

30
application/Espo/Core/Acl/Table.php
View File

@@ -122,14 +122,14 @@ class Table
private function load()
{
$aclTables = [];
$aclTableList = [];
$assignmentPermissionList = [];
$userPermissionList = [];
$userRoles = $this->user->get('roles');
foreach ($userRoles as $role) {
$aclTables[] = $role->get('data');
$aclTableList[] = $role->get('data');
$assignmentPermissionList[] = $role->get('assignmentPermission');
$userPermissionList[] = $role->get('userPermission');
}
@@ -138,13 +138,21 @@ class Table
foreach ($teams as $team) {
$teamRoles = $team->get('roles');
foreach ($teamRoles as $role) {
$aclTables[] = $role->get('data');
$aclTableList[] = $role->get('data');
$assignmentPermissionList[] = $role->get('assignmentPermission');
$userPermissionList[] = $role->get('userPermission');
}
}
$this->data['table'] = $this->merge($aclTables);
$aclTable = $this->merge($aclTableList);
foreach ($this->getScopeList() as $scope) {
if ($this->metadata->get('scopes.' . $scope . '.disabled')) {
$aclTable[$scope] = false;
}
}
$this->data['table'] = $aclTable;
$this->data['assignmentPermission'] = $this->mergeValues($assignmentPermissionList, $this->metadata->get('app.acl.valueDefaults.assignmentPermission', 'all'));
$this->data['userPermission'] = $this->mergeValues($userPermissionList, $this->metadata->get('app.acl.valueDefaults.userPermission', 'no'));
@@ -183,7 +191,7 @@ class Table
return $result;
}
private function getScopeList()
private function getScopeWithAclList()
{
$scopeList = [];
$scopes = $this->metadata->get('scopes');
@@ -195,10 +203,20 @@ class Table
return $scopeList;
}
private function getScopeList()
{
$scopeList = [];
$scopes = $this->metadata->get('scopes');
foreach ($scopes as $scope => $d) {
$scopeList[] = $scope;
}
return $scopeList;
}
private function merge($tables)
{
$data = array();
$scopeList = $this->getScopeList();
$scopeList = $this->getScopeWithAclList();
foreach ($tables as $table) {
foreach ($scopeList as $scope) {

17
application/Espo/Core/Utils/EntityManager.php
View File

@@ -123,6 +123,10 @@ class EntityManager
if (!empty($params['stream'])) {
$stream = $params['stream'];
}
$disabled = false;
if (!empty($params['disabled'])) {
$disabled = $params['disabled'];
}
$labelSingular = $name;
if (!empty($params['labelSingular'])) {
$labelSingular = $params['labelSingular'];
@@ -139,6 +143,7 @@ class EntityManager
$scopesData = Json::decode($scopesDataContents, true);
$scopesData['stream'] = $stream;
$scopesData['disabled'] = $disabled;
$scopesData['type'] = $type;
$scopesData['module'] = 'Custom';
$scopesData['object'] = true;
@@ -179,10 +184,14 @@ class EntityManager
throw new Error('Entity ['.$name.'] does not exist.');
}
if (isset($data['stream'])) {
$scopeData = array(
'stream' => (true == $data['stream'])
);
if (isset($data['stream']) || isset($data['disabled'])) {
$scopeData = array();
if (isset($data['stream'])) {
$scopeData['stream'] = true == $data['stream'];
}
if (isset($data['disabled'])) {
$scopeData['disabled'] = true == $data['disabled'];
}
$this->getMetadata()->set('scopes', $name, $scopeData);
}

4
application/Espo/Modules/Crm/Controllers/Activities.php
View File

@@ -105,6 +105,10 @@ class Activities extends \Espo\Core\Controllers\Base
public function actionList($params, $data, $request)
{
if (!$this->getAcl()->check('Activities')) {
throw new Forbidden();
}
$name = $params['name'];
if (!in_array($name, ['activities', 'history'])) {

6
application/Espo/Modules/Crm/Resources/i18n/en_US/Global.json
View File

@@ -16,7 +16,8 @@
"TargetList": "Target List",
"MassEmail": "Mass Email",
"EmailQueueItem": "Email Queue Item",
"CampaignTrackingUrl": "Tracking URL"
"CampaignTrackingUrl": "Tracking URL",
"Activities": "Activities"
},
"scopeNamesPlural": {
"Account": "Accounts",
@@ -35,7 +36,8 @@
"TargetList": "Target Lists",
"MassEmail": "Mass Emails",
"EmailQueueItem": "Email Queue Items",
"CampaignTrackingUrl": "Tracking URLs"
"CampaignTrackingUrl": "Tracking URLs",
"Activities": "Activities"
},
"dashlets": {
"Leads": "My Leads",

23
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Account.json
View File

@@ -1,36 +1,39 @@
{
"controller": "controllers/record",
"views":{
"detail":"Crm:Account.Detail"
"views": {
"detail":"crm:views/account/detail"
},
"sidePanels":{
"detail":[
"sidePanels": {
"detail": [
{
"name":"activities",
"label":"Activities",
"view":"Crm:Record.Panels.Activities"
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"Crm:Record.Panels.History"
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"Crm:Record.Panels.Tasks"
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},
"relationshipPanels":{
"contacts":{
"relationshipPanels": {
"contacts": {
"layout":"listForAccount"
},
"opportunities":{
"layout":"listForAccount"
},
"campaignLogRecords": {
"rowActionsView": "Record.RowActions.Empty",
"rowActionsView": "views/record/row-actions/empty",
"select": false,
"create": false
}

9
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Case.json
View File

@@ -12,17 +12,20 @@
{
"name":"activities",
"label":"Activities",
"view":"Crm:Case.Record.Panels.Activities"
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"Crm:Record.Panels.History"
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"Crm:Record.Panels.Tasks"
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},

9
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Contact.json
View File

@@ -8,17 +8,20 @@
{
"name":"activities",
"label":"Activities",
"view":"Crm:Record.Panels.Activities"
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"Crm:Record.Panels.History"
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"Crm:Record.Panels.Tasks"
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},

9
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json
View File

@@ -36,17 +36,20 @@
{
"name":"activities",
"label":"Activities",
"view":"Crm:Record.Panels.Activities"
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"Crm:Record.Panels.History"
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"Crm:Record.Panels.Tasks"
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
],
"edit": [

9
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Opportunity.json
View File

@@ -8,17 +8,20 @@
{
"name":"activities",
"label":"Activities",
"view":"Crm:Record.Panels.Activities"
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"Crm:Record.Panels.History"
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"Crm:Record.Panels.Tasks"
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},

2
application/Espo/Modules/Crm/Resources/metadata/scopes/Activities.json
View File

@@ -2,7 +2,7 @@
"entity": false,
"layouts": false,
"tab": false,
"acl": false,
"acl": "boolean",
"module": "Crm",
"customizable": false
}

3
application/Espo/Resources/i18n/en_US/EntityManager.json
View File

@@ -19,7 +19,8 @@
"sortDirection": "Default Order (direction)",
"relationName": "Middle Table Name",
"linkMultipleField": "Link Multiple Field",
"linkMultipleFieldForeign": "Foreign Link Multiple Field"
"linkMultipleFieldForeign": "Foreign Link Multiple Field",
"disabled": "Disabled"
},
"options": {
"type": {

6
frontend/client/modules/crm/src/views/lead/record/panels/converted-to.js
View File

@@ -33,14 +33,14 @@ Espo.define('crm:views/lead/record/panels/converted-to', 'views/record/panels/si
setup: function () {
this.fieldList = [];
if (this.getAcl().check('Account')) {
if (this.getAcl().check('Account') && !this.getMetadata().get('scopes.Account.disabled')) {
this.fieldList.push('createdAccount');
}
if (this.getAcl().check('Contact')) {
if (this.getAcl().check('Contact') && !this.getMetadata().get('scopes.Contact.disabled')) {
this.fieldList.push('createdContact');
}
if (this.getAcl().check('Opportunity')) {
if (this.getAcl().check('Opportunity') && !this.getMetadata().get('scopes.Opportunity.disabled')) {
this.fieldList.push('createdOpportunity');
}

4
frontend/client/modules/crm/src/views/meeting/record/panels/attendees.js
View File

@@ -35,10 +35,10 @@ Espo.define('crm:views/meeting/record/panels/attendees', 'views/record/panels/si
this.fieldList.push('users');
if (this.getAcl().check('Contact')) {
if (this.getAcl().check('Contact') && !this.getMetadata().get('scopes.Contact.disabled')) {
this.fieldList.push('contacts');
}
if (this.getAcl().check('Lead')) {
if (this.getAcl().check('Lead') && !this.getMetadata().get('scopes.Lead.disabled')) {
this.fieldList.push('leads');
}

12
frontend/client/res/templates/admin/entity-manager/modals/edit-entity.tpl
View File

@@ -26,16 +26,24 @@
</div>
</div>
</div>
{{#if stream}}
<div class="row">
<div class="cell cell-disabled form-group col-md-6">
<label class="field-label-disabled control-label">{{translate 'disabled' category='fields' scope='EntityManager'}}</label>
<div class="field field-disabled">
{{{disabled}}}
</div>
</div>
{{#if stream}}
<div class="cell cell-stream form-group col-md-6">
<label class="field-label-stream control-label">{{translate 'stream' category='fields' scope='EntityManager'}}</label>
<div class="field field-stream">
{{{stream}}}
</div>
</div>
{{/if}}
</div>
{{/if}}
{{#if sortBy}}
<div class="row">
<div class="cell cell-sortBy form-group col-md-6">

20
frontend/client/src/acl.js
View File

@@ -63,25 +63,25 @@ Espo.define('acl', [], function () {
return this.data[name] || null;
},
check: function (controller, action, isOwner, inTeam) {
check: function (scope, action, isOwner, inTeam) {
if (this.user.isAdmin()) {
return true;
}
if (controller in this.data.table) {
if (this.data.table[controller] === false) {
if (scope in this.data.table) {
if (this.data.table[scope] === false) {
return false;
}
if (this.data.table[controller] === true) {
if (this.data.table[scope] === true) {
return true;
}
if (typeof this.data.table[controller] === 'string') {
if (typeof this.data.table[scope] === 'string') {
return true;
}
if (typeof action !== 'undefined') {
if (action in this.data.table[controller]) {
var value = this.data.table[controller][action];
if (action in this.data.table[scope]) {
var value = this.data.table[scope][action];
if (value === 'all' || value === true) {
return true;
@@ -96,7 +96,7 @@ Espo.define('acl', [], function () {
}
if (isOwner && action == 'delete' && value === 'no') {
return this.check(controller, 'edit', isOwner);
return this.check(scope, 'edit', isOwner);
}
if (!value || value === 'no') {
@@ -121,6 +121,10 @@ Espo.define('acl', [], function () {
return true;
},
checkScope: function (scope, action) {
return this.check(scope, action);
},
checkModel: function (model, action) {
if (action == 'edit') {
if (!model.isEditable()) {

35
frontend/client/src/metadata.js
View File

@@ -106,6 +106,41 @@ Espo.define('metadata', [], function () {
}
},
getScopeList: function () {
var scopes = this.get('scopes') || {};
var scopeList = [];
for (scope in scopes) {
var d = scopes[scope];
if (d.disabled) continue;
scopeList.push(scope);
}
return scopeList;
},
getScopeObjectList: function () {
var scopes = this.get('scopes') || {};
var scopeList = [];
for (scope in scopes) {
var d = scopes[scope];
if (d.disabled) continue;
if (!d.object) continue;
scopeList.push(scope);
}
return scopeList;
},
getScopeEntityList: function () {
var scopes = this.get('scopes') || {};
var scopeList = [];
for (scope in scopes) {
var d = scopes[scope];
if (d.disabled) continue;
if (!d.entity) continue;
scopeList.push(scope);
}
return scopeList;
}
}, Backbone.Events);
return Metadata;

16
frontend/client/src/views/admin/entity-manager/index.js
View File

@@ -106,7 +106,7 @@ Espo.define('views/admin/entity-manager/index', 'view', function (Dep) {
},
createEntity: function () {
this.createView('edit', 'Admin.EntityManager.Modals.EditEntity', {}, function (view) {
this.createView('edit', 'views/admin/entity-manager/modals/edit-entity', {}, function (view) {
view.render();
this.listenTo(view, 'after:save', function () {
@@ -114,11 +114,15 @@ Espo.define('views/admin/entity-manager/index', 'view', function (Dep) {
this.setupScopeData();
this.render();
}, this);
}.bind(this));
this.listenTo(view, 'close', function () {
this.clearView('edit');
}, this);
}, this);
},
editEntity: function (scope) {
this.createView('edit', 'Admin.EntityManager.Modals.EditEntity', {
this.createView('edit', 'views/admin/entity-manager/modals/edit-entity', {
scope: scope
}, function (view) {
view.render();
@@ -128,7 +132,11 @@ Espo.define('views/admin/entity-manager/index', 'view', function (Dep) {
this.setupScopeData();
this.render();
}, this);
}.bind(this));
this.listenTo(view, 'close', function () {
this.clearView('edit');
}, this);
}, this);
},
removeEntity: function (scope) {

28
frontend/client/src/views/admin/entity-manager/modals/edit-entity.js
View File

@@ -80,12 +80,13 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
this.model.set('labelPlural', this.translate(scope, 'scopeNamesPlural'));
this.model.set('type', this.getMetadata().get('scopes.' + scope + '.type') || '');
this.model.set('stream', this.getMetadata().get('scopes.' + scope + '.stream') || false);
this.model.set('disabled', this.getMetadata().get('scopes.' + scope + '.disabled') || false);
this.model.set('sortBy', this.getMetadata().get('entityDefs.' + scope + '.collection.sortBy'));
this.model.set('sortDirection', this.getMetadata().get('entityDefs.' + scope + '.collection.asc') ? 'asc' : 'desc');
}
this.createView('type', 'Fields.Enum', {
this.createView('type', 'views/fields/enum', {
model: model,
mode: 'edit',
el: this.options.el + ' .field-type',
@@ -100,7 +101,7 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
});
if (this.hasStreamField) {
this.createView('stream', 'Fields.Bool', {
this.createView('stream', 'views/fields/bool', {
model: model,
mode: 'edit',
el: this.options.el + ' .field-stream',
@@ -110,6 +111,15 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
});
}
this.createView('disabled', 'views/fields/bool', {
model: model,
mode: 'edit',
el: this.options.el + ' .field-disabled',
defs: {
name: 'disabled'
}
});
this.createView('name', 'Fields.Varchar', {
model: model,
mode: 'edit',
@@ -122,7 +132,7 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
},
readOnly: scope != false
});
this.createView('labelSingular', 'Fields.Varchar', {
this.createView('labelSingular', 'views/fields/varchar', {
model: model,
mode: 'edit',
el: this.options.el + ' .field-labelSingular',
@@ -133,7 +143,7 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
}
}
});
this.createView('labelPlural', 'Fields.Varchar', {
this.createView('labelPlural', 'views/fields/varchar', {
model: model,
mode: 'edit',
el: this.options.el + ' .field-labelPlural',
@@ -161,7 +171,7 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
translatedOptions[item] = this.translate(item, 'fields', scope);
}, this);
this.createView('sortBy', 'Fields.Enum', {
this.createView('sortBy', 'views/fields/enum', {
model: model,
mode: 'edit',
el: this.options.el + ' .field-sortBy',
@@ -174,7 +184,7 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
}
});
this.createView('sortDirection', 'Fields.Enum', {
this.createView('sortDirection', 'views/fields/enum', {
model: model,
mode: 'edit',
el: this.options.el + ' .field-sortDirection',
@@ -214,7 +224,8 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
'type',
'labelSingular',
'labelPlural',
'stream'
'stream',
'disabled'
];
if (this.scope) {
@@ -254,7 +265,8 @@ Espo.define('views/admin/entity-manager/modals/edit-entity', ['views/modal', 'mo
labelSingular: this.model.get('labelSingular'),
labelPlural: this.model.get('labelPlural'),
type: this.model.get('type'),
stream: this.model.get('stream')
stream: this.model.get('stream'),
disabled: this.model.get('disabled')
};
if (this.scope) {

10
frontend/client/src/views/admin/layouts/index.js
View File

@@ -26,11 +26,11 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('Views.Admin.Layouts.Index', 'View', function (Dep) {
Espo.define('views/admin/layouts/index', 'view', function (Dep) {
return Dep.extend({
template: 'admin.layouts.index',
template: 'admin/layouts/index',
scopeList: null,
@@ -82,16 +82,16 @@ Espo.define('Views.Admin.Layouts.Index', 'View', function (Dep) {
setup: function () {
this.scopeList = [];
var scopesAll = Object.keys(this.getMetadata().get('scopes')).sort(function (v1, v2) {
var scopeFullList = this.getMetadata().getScopeList().sort(function (v1, v2) {
return this.translate(v1, 'scopeNamesPlural').localeCompare(this.translate(v2, 'scopeNamesPlural'));
}.bind(this));
scopesAll.forEach(function (scope) {
scopeFullList.forEach(function (scope) {
if (this.getMetadata().get('scopes.' + scope + '.entity') &&
this.getMetadata().get('scopes.' + scope + '.layouts')) {
this.scopeList.push(scope);
}
}.bind(this));
}, this);
this.on('after:render', function () {
$("#layouts-menu button[data-scope='" + this.options.scope + "'][data-type='" + this.options.type + "']").addClass('disabled');

23
frontend/client/src/views/record/detail-bottom.js
View File

@@ -26,11 +26,11 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('Views.Record.DetailBottom', 'View', function (Dep) {
Espo.define('views/record/detail-bottom', 'view', function (Dep) {
return Dep.extend({
template: 'record.bottom',
template: 'record/bottom',
mode: 'detail',
@@ -72,7 +72,7 @@ Espo.define('Views.Record.DetailBottom', 'View', function (Dep) {
panelList.push({
"name":"stream",
"label":"Stream",
"view":"Stream.Panel",
"view":"views/stream/panel",
"sticked": true
});
}
@@ -112,6 +112,18 @@ Espo.define('Views.Record.DetailBottom', 'View', function (Dep) {
this.scope = this.model.name;
this.setupPanels();
var panelList = [];
this.panelList.forEach(function (p) {
if (p.aclScope) {
if (!this.getAcl().checkScope(p.aclScope)) {
return;
}
}
panelList.push(p);
}, this);
this.panelList = panelList;
this.setupPanelViews();
if (this.relationshipPanels) {
@@ -122,6 +134,8 @@ Espo.define('Views.Record.DetailBottom', 'View', function (Dep) {
setupRelationshipPanels: function () {
var scope = this.scope;
var scopesDefs = this.getMetadata().get('scopes') || {};
this.wait(true);
this._helper.layoutManager.get(this.model.name, 'relationships', function (layout) {
var panelList = layout;
@@ -144,6 +158,9 @@ Espo.define('Views.Record.DetailBottom', 'View', function (Dep) {
}
var foreignScope = links[name].entity;
if ((scopesDefs[foreignScope] || {}).disabled) return;
if (!this.getAcl().check(foreignScope, 'read')) {
return;
}

18
frontend/client/src/views/record/detail-side.js
View File

@@ -25,7 +25,8 @@
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('views/record/detail-side', 'view', function (Dep) {
Espo.define('views/record/detail-side', 'view', function (Dep) {
return Dep.extend({
@@ -117,6 +118,17 @@
this.panelList.push(panel);
}, this);
var panelList = [];
this.panelList.forEach(function (p) {
if (p.aclScope) {
if (!this.getAcl().checkScope(p.aclScope)) {
return;
}
}
panelList.push(p);
}, this);
this.panelList = panelList;
this.panelList.forEach(function (p) {
var o = {
model: this.options.model,
@@ -139,8 +151,8 @@
} else {
p.title = view.title;
}
}.bind(this));
}.bind(this));
}, this);
}, this);
},
getFields: function () {

5
frontend/client/src/views/role/record/table.js
View File

@@ -26,11 +26,11 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('Views.Role.Record.Table', 'View', function (Dep) {
Espo.define('views/role/record/table', 'view', function (Dep) {
return Dep.extend({
template: 'role.table',
template: 'role/table',
scopeList: null,
@@ -139,6 +139,7 @@ Espo.define('Views.Role.Record.Table', 'View', function (Dep) {
}.bind(this));
scopesAll.forEach(function (scope) {
if (this.getMetadata().get('scopes.' + scope + '.disabled')) return;
var acl = this.getMetadata().get('scopes.' + scope + '.acl');
if (acl) {
this.scopeList.push(scope);

4
frontend/client/src/views/settings/fields/quick-create-list.js
View File

@@ -32,14 +32,14 @@ Espo.define('views/settings/fields/quick-create-list', 'views/fields/array', fun
setup: function () {
this.params.options = Object.keys(this.getMetadata().get('scopes')).filter(function (scope) {
if (this.getMetadata().get('scopes.' + scope + '.disabled')) return;
return this.getMetadata().get('scopes.' + scope + '.entity') && this.getMetadata().get('scopes.' + scope + '.tab');
}, this).sort(function (v1, v2) {
return this.translate(v1, 'scopeNamesPlural').localeCompare(this.translate(v2, 'scopeNamesPlural'));
}.bind(this));
Dep.prototype.setup.call(this);
},
}
});

12
frontend/client/src/views/settings/fields/tab-list.js
View File

@@ -25,22 +25,22 @@
* In accordance with Section 7(b) of the GNU General Public License version 3,
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('Views.Settings.Fields.TabList', 'Views.Fields.Array', function (Dep) {
Espo.define('views/settings/fields/tab-list', 'views/fields/array', function (Dep) {
return Dep.extend({
setup: function () {
this.params.options = Object.keys(this.getMetadata().get('scopes')).filter(function (scope) {
if (this.getMetadata().get('scopes.' + scope + '.disabled')) return;
return this.getMetadata().get('scopes.' + scope + '.tab');
}, this).sort(function (v1, v2) {
return this.translate(v1, 'scopeNamesPlural').localeCompare(this.translate(v2, 'scopeNamesPlural'));
}.bind(this));
Dep.prototype.setup.call(this);
},
}
});
});

10
frontend/client/src/views/site/navbar.js
View File

@@ -30,7 +30,7 @@ Espo.define('views/site/navbar', 'view', function (Dep) {
return Dep.extend({
template: 'site.navbar',
template: 'site/navbar',
currentTab: null,
@@ -102,15 +102,19 @@ Espo.define('views/site/navbar', 'view', function (Dep) {
tabList = tabList || [];
var scopes = this.getMetadata().get('scopes') || {};
this.tabList = tabList.filter(function (scope) {
if (this.getMetadata().get('scopes.' + scope + '.acl')) {
if ((scopes[scope] || {}).disabled) return;
if ((scopes[scope] || {}).acl) {
return this.getAcl().check(scope);
}
return true;
}, this);
this.quickCreateList = (this.getConfig().get('quickCreateList') || []).filter(function (scope) {
if (this.getMetadata().get('scopes.' + scope + '.acl')) {
if ((scopes[scope] || {}).disabled) return;
if ((scopes[scope] || {}).acl) {
return this.getAcl().check(scope, 'edit');
}
return true;

8
frontend/client/src/views/user/record/detail-side.js
View File

@@ -34,7 +34,7 @@ Espo.define('views/user/record/detail-side', 'views/record/detail-side', functio
{
name: 'default',
label: false,
view: 'Record.Panels.Side',
view: 'views/record/panels/side',
options: {
fieldList: ['avatar'],
mode: 'detail',
@@ -65,13 +65,15 @@ Espo.define('views/user/record/detail-side', 'views/record/detail-side', functio
"name":"activities",
"label":"Activities",
"view":"crm:views/record/panels/activities",
"hidden": !showActivities
"hidden": !showActivities,
"aclScope": "Activities"
});
this.panelList.push({
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"hidden": !showActivities
"hidden": !showActivities,
"aclScope": "Activities"
});
}