espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/4.3.1'

Browse Source
This commit is contained in:
yuri
2016-12-16 12:14:28 +02:00
parent 9bfe12587f 3def2ef0da
commit 3249c07bcd
28 changed files with 296 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/Espo/Modules/Crm/Resources/layouts/Account/sidePanelsDetailSmall.json
+11
View File
@@ -0,0 +1,11 @@
{
"activities": {
"disabled": true
},
"history": {
"disabled": true
},
"tasks": {
"disabled": true
}
}
application/Espo/Modules/Crm/Resources/layouts/Case/sidePanelsDetailSmall.json
+11
View File
@@ -0,0 +1,11 @@
{
"activities": {
"disabled": true
},
"history": {
"disabled": true
},
"tasks": {
"disabled": true
}
}
application/Espo/Modules/Crm/Resources/layouts/Contact/sidePanelsDetailSmall.json
+11
View File
@@ -0,0 +1,11 @@
{
"activities": {
"disabled": true
},
"history": {
"disabled": true
},
"tasks": {
"disabled": true
}
}
application/Espo/Modules/Crm/Resources/layouts/Lead/detail.json
+1 -1
View File
@@ -13,7 +13,7 @@
"rows": [
[{"name":"status"},{"name":"source"}],
[{"name":"opportunityAmount"},{"name":"campaign"}],
[false, {"name":"industry"}],
[{"name":"industry"}, false],
[{"name":"description", "fullWidth": true}]
]
}
application/Espo/Modules/Crm/Resources/layouts/Lead/sidePanelsDetailSmall.json
+11
View File
@@ -0,0 +1,11 @@
{
"activities": {
"disabled": true
},
"history": {
"disabled": true
},
"tasks": {
"disabled": true
}
}
application/Espo/Modules/Crm/Resources/layouts/Opportunity/sidePanelsDetailSmall.json
+11
View File
@@ -0,0 +1,11 @@
{
"activities": {
"disabled": true
},
"history": {
"disabled": true
},
"tasks": {
"disabled": true
}
}
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Account.json
+20
View File
@@ -24,6 +24,26 @@
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
],
"detailSmall": [
{
"name":"activities",
"label":"Activities",
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},
"relationshipPanels": {
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Case.json
+20 -4
View File
@@ -3,10 +3,6 @@
"recordViews": {
"detail": "crm:views/case/record/detail"
},
"bottomPanels":{
"detail":[
]
},
"sidePanels":{
"detail":[
{
@@ -27,6 +23,26 @@
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
],
"detailSmall":[
{
"name":"activities",
"label":"Activities",
"view":"crm:views/case/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},
"filterList": [
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Contact.json
+20
View File
@@ -52,6 +52,26 @@
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
],
"detailSmall":[
{
"name":"activities",
"label":"Activities",
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},
"relationshipPanels": {
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Lead.json
+18
View File
@@ -71,6 +71,24 @@
"notRefreshable": true,
"hidden": true,
"style": "success"
},
{
"name":"activities",
"label":"Activities",
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
],
"editSmall": [
application/Espo/Modules/Crm/Resources/metadata/clientDefs/Opportunity.json
+21 -1
View File
@@ -1,7 +1,7 @@
{
"controller": "controllers/record",
"views":{
"detail":"Crm:Opportunity.Detail"
"detail":"crm:views/opportunity/detail"
},
"sidePanels":{
"detail":[
@@ -23,6 +23,26 @@
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
],
"detailSmall":[
{
"name":"activities",
"label":"Activities",
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},
"filterList": [
application/Espo/Modules/Crm/Resources/metadata/entityDefs/Task.json
+2 -1
View File
@@ -110,7 +110,8 @@
},
"assignedUser": {
"type": "belongsTo",
"entity": "User"
"entity": "User",
"foreign": "tasks"
},
"teams": {
"type": "hasMany",
application/Espo/Resources/i18n/en_US/User.json
+2 -1
View File
@@ -35,7 +35,8 @@
"portalRoles": "Portal Roles",
"contact": "Contact",
"accounts": "Accounts",
"account": "Account (Primary)"
"account": "Account (Primary)",
"tasks": "Tasks"
},
"labels": {
"Create User": "Create User",
application/Espo/Resources/layouts/User/sidePanelsDetailSmall.json
+11
View File
@@ -0,0 +1,11 @@
{
"activities": {
"disabled": true
},
"history": {
"disabled": true
},
"tasks": {
"disabled": true
}
}
application/Espo/Resources/metadata/clientDefs/User.json
+56
View File
@@ -10,6 +10,62 @@
"editQuick":"views/user/record/edit-quick",
"list":"views/user/record/list"
},
"defaultSidePanelFieldList": {
"detail": [
"avatar"
],
"detailSmall": [
"avatar"
],
"edit": [
"avatar"
],
"editSmall": [
"avatar"
]
},
"sidePanels": {
"detail": [
{
"name":"activities",
"label":"Activities",
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
],
"detailSmall": [
{
"name":"activities",
"label":"Activities",
"view":"crm:views/record/panels/activities",
"aclScope": "Activities"
},
{
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"aclScope": "Activities"
},
{
"name":"tasks",
"label":"Tasks",
"view":"crm:views/record/panels/tasks",
"aclScope": "Task"
}
]
},
"filterList": [
"active",
"activePortal"
application/Espo/Resources/metadata/entityDefs/User.json
+5
View File
@@ -253,6 +253,11 @@
"entity": "Account",
"foreign": "portalUsers",
"relationName": "AccountPortalUser"
},
"tasks": {
"type": "hasMany",
"entity": "Task",
"foreign": "assignedUser"
}
},
"collection": {
client/res/templates/fields/enum-styled/detail.tpl
+5 -1
View File
@@ -1 +1,5 @@
<span class="text-{{style}}">{{translateOption value scope=scope field=name}}</span>
{{#if isNotEmpty}}
<span class="text-{{style}}">{{translateOption value scope=scope field=name}}</span>
{{else}}
{{translate 'None'}}
{{/if}}
client/res/templates/fields/enum-styled/list.tpl
+3
View File
@@ -0,0 +1,3 @@
{{#if isNotEmpty}}
<span class="text-{{style}}">{{translateOption value scope=scope field=name}}</span>
{{/if}}
client/res/templates/fields/enum/detail.tpl
+5 -1
View File
@@ -1 +1,5 @@
{{translateOption value scope=scope field=name translatedOptions=translatedOptions}}
{{#if isNotEmpty}}
{{translateOption value scope=scope field=name translatedOptions=translatedOptions}}
{{else}}
{{translate 'None'}}
{{/if}}
client/res/templates/fields/enum/list.tpl
+3
View File
@@ -0,0 +1,3 @@
{{#if isNotEmpty}}
{{translateOption value scope=scope field=name translatedOptions=translatedOptions}}
{{/if}}
client/src/views/fields/enum-styled.js
+4 -4
View File
@@ -26,13 +26,13 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('Views.Fields.EnumStyled', 'Views.Fields.Enum', function (Dep) {
Espo.define('views/fields/enum-styled', 'views/fields/enum', function (Dep) {
return Dep.extend({
listTemplate: 'fields.enum-styled.detail',
listTemplate: 'fields/enum-styled/list',
detailTemplate: 'fields.enum-styled.detail',
detailTemplate: 'fields/enum-styled/detail',
data: function () {
var value = this.model.get(this.name);
@@ -49,7 +49,7 @@ Espo.define('Views.Fields.EnumStyled', 'Views.Fields.Enum', function (Dep) {
Dep.prototype.setup.call(this);
this.styleHash = this.model.getFieldParam(this.name, 'style') || {};
},
}
});
});
client/src/views/fields/enum.js
+11 -1
View File
@@ -32,7 +32,7 @@ Espo.define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], functio
type: 'enum',
listTemplate: 'fields/enum/detail',
listTemplate: 'fields/enum/list',
detailTemplate: 'fields/enum/detail',
@@ -45,6 +45,16 @@ Espo.define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], functio
data: function () {
var data = Dep.prototype.data.call(this);
data.translatedOptions = this.translatedOptions;
var value = this.model.get(this.name);
if (
value !== null
&&
value !== ''
||
value === '' && (value in (this.translatedOptions || {}))
) {
data.isNotEmpty = true;
}
return data;
},
client/src/views/fields/varchar.js
+12
View File
@@ -45,6 +45,18 @@ Espo.define('views/fields/varchar', 'views/fields/base', function (Dep) {
}, this.events || {});
},
data: function () {
var data = Dep.prototype.data.call(this);
if (
this.model.get(this.name) !== null
&&
this.model.get(this.name) !== ''
) {
data.isNotEmpty = true;
}
return data;
},
handleSearchType: function (type) {
if (~['isEmpty', 'isNotEmpty'].indexOf(type)) {
this.$el.find('input.main-element').addClass('hidden');
client/src/views/record/detail-bottom.js
+5 -5
View File
@@ -67,6 +67,8 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) {
},
showPanel: function (name, callback) {
this.recordHelper.setPanelStateParam(name, 'hidden', false);
var isFound = false;
this.panelList.forEach(function (d) {
if (d.name == name) {
@@ -76,8 +78,6 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) {
}, this);
if (!isFound) return;
this.recordHelper.setPanelStateParam(name, 'hidden', false);
if (this.isRendered()) {
var view = this.getView(name);
if (view) {
@@ -97,6 +97,8 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) {
},
hidePanel: function (name, callback) {
this.recordHelper.setPanelStateParam(name, 'hidden', true);
var isFound = false;
this.panelList.forEach(function (d) {
if (d.name == name) {
@@ -106,8 +108,6 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) {
}, this);
if (!isFound) return;
this.recordHelper.setPanelStateParam(name, 'hidden', true);
if (this.isRendered()) {
var view = this.getView(name);
if (view) {
@@ -129,7 +129,7 @@ Espo.define('views/record/detail-bottom', 'view', function (Dep) {
setupPanels: function () {
var scope = this.scope;
this.panelList = Espo.Utils.clone(this.getMetadata().get('clientDefs.' + scope + '.bottomPanels.' + this.mode) || this.panelList || []);
this.panelList = Espo.Utils.clone(this.getMetadata().get('clientDefs.' + scope + '.bottomPanels.' + this.type) || this.panelList || []);
if (this.streamPanel && this.getMetadata().get('scopes.' + scope + '.stream')) {
this.setupStreamPanel();
client/src/views/record/detail-side.js
+5 -6
View File
@@ -140,9 +140,8 @@ Espo.define('views/record/detail-side', 'view', function (Dep) {
return item;
}, this);
this.wait(true);
this.getHelper().layoutManager.get(this.scope, 'sidePanels' + Espo.Utils.upperCaseFirst(this.mode), function (layoutData) {
this.getHelper().layoutManager.get(this.scope, 'sidePanels' + Espo.Utils.upperCaseFirst(this.type), function (layoutData) {
if (layoutData) {
this.alterPanels(layoutData);
}
@@ -267,6 +266,8 @@ Espo.define('views/record/detail-side', 'view', function (Dep) {
},
showPanel: function (name, callback) {
this.recordHelper.setPanelStateParam(name, 'hidden', false);
var isFound = false;
this.panelList.forEach(function (d) {
if (d.name == name) {
@@ -276,8 +277,6 @@ Espo.define('views/record/detail-side', 'view', function (Dep) {
}, this);
if (!isFound) return;
this.recordHelper.setPanelStateParam(name, 'hidden', false);
if (this.isRendered()) {
var view = this.getView(name);
if (view) {
@@ -297,6 +296,8 @@ Espo.define('views/record/detail-side', 'view', function (Dep) {
},
hidePanel: function (name, callback) {
this.recordHelper.setPanelStateParam(name, 'hidden', true);
var isFound = false;
this.panelList.forEach(function (d) {
if (d.name == name) {
@@ -306,8 +307,6 @@ Espo.define('views/record/detail-side', 'view', function (Dep) {
}, this);
if (!isFound) return;
this.recordHelper.setPanelStateParam(name, 'hidden', true);
if (this.isRendered()) {
var view = this.getView(name);
if (view) {
client/src/views/user/record/detail-quick-side.js
+4 -12
View File
@@ -26,21 +26,13 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('views/user/record/detail-quick-side', 'views/record/detail-side', function (Dep) {
Espo.define('views/user/record/detail-quick-side', ['views/record/detail-side', 'views/user/record/detail-side'], function (Dep, UserDetailSide) {
return Dep.extend({
panelList: [
{
name: 'default',
label: false,
view: 'views/record/panels/side',
options: {
fieldList: ['avatar'],
mode: 'detail',
}
}
]
setupPanels: function () {
UserDetailSide.prototype.setupPanels.call(this);
}
});
client/src/views/user/record/detail-side.js
+8 -24
View File
@@ -30,16 +30,6 @@ Espo.define('views/user/record/detail-side', 'views/record/detail-side', functio
return Dep.extend({
defaultPanelDefs: {
name: 'default',
label: false,
view: 'views/record/panels/side',
options: {
fieldList: ['avatar'],
mode: 'detail',
}
},
setupPanels: function () {
Dep.prototype.setupPanels.call(this);
@@ -55,26 +45,20 @@ Espo.define('views/user/record/detail-side', 'views/record/detail-side', functio
this.showPanel('history', function () {
this.getView('history').actionRefresh();
});
this.showPanel('tasks', function () {
this.getView('tasks').actionRefresh();
});
}
}, this);
}
}
}
this.panelList.push({
"name":"activities",
"label":"Activities",
"view":"crm:views/record/panels/activities",
"hidden": !showActivities,
"aclScope": "Activities"
});
this.panelList.push({
"name":"history",
"label":"History",
"view":"crm:views/record/panels/history",
"hidden": !showActivities,
"aclScope": "Activities"
});
if (!showActivities) {
this.hidePanel('activities');
this.hidePanel('history');
this.hidePanel('tasks');
}
}
});
client/src/views/user/record/edit-side.js
-10
View File
@@ -30,16 +30,6 @@ Espo.define('views/user/record/edit-side', 'views/record/edit-side', function (D
return Dep.extend({
defaultPanelDefs: {
name: 'default',
label: false,
view: 'views/record/panels/side',
options: {
fieldList: ['avatar'],
mode: 'edit',
}
}
});
});