Skip to content

EspoCRM – Open Source CRM Application

fix user detail layout

Yuri Kuznetsov986af050024b
diff --git a/client/src/views/user/record/edit.js b/client/src/views/user/record/edit.js
index 4de05f830b..b4b7304461 100644
--- a/client/src/views/user/record/edit.js
+++ b/client/src/views/user/record/edit.js
@@ -175,9 +175,13 @@ class UserEditRecordView extends EditRecordView {
getGridLayout(callback) {
this.getHelper().layoutManager
.get(this.model.entityType, this.options.layoutName || this.layoutName, simpleLayout => {
+ /** @type {module:views/record/detail~panelDefs[]} */
const layout = Espo.Utils.cloneDeep(simpleLayout);
- layout.push({
+ /** @type {module:views/record/detail~panelDefs[]} */
+ const panels = [];
+
+ panels.push({
"label": "Teams and Access Control",
"name": "accessControl",
"rows": [
@@ -187,7 +191,7 @@ class UserEditRecordView extends EditRecordView {
]
});
- layout.push({
+ panels.push({
"label": "Portal",
"name": "portal",
"rows": [
@@ -197,7 +201,7 @@ class UserEditRecordView extends EditRecordView {
});
if (this.getUser().isAdmin() && this.model.isPortal()) {
- layout.push({
+ panels.push({
"label": "Misc",
"name": "portalMisc",
"rows": [
@@ -207,7 +211,7 @@ class UserEditRecordView extends EditRecordView {
}
if (this.model.isAdmin() || this.model.isRegular()) {
- layout.push({
+ panels.push({
"label": "Misc",
"name": "misc",
"rows": [
@@ -221,7 +225,7 @@ class UserEditRecordView extends EditRecordView {
this.getUser().isAdmin() &&
!this.model.isApi()
) {
- layout.push({
+ panels.push({
label: 'Password',
rows: [
[
@@ -273,7 +277,7 @@ class UserEditRecordView extends EditRecordView {
}
if (this.getUser().isAdmin() && this.model.isApi()) {
- layout.push({
+ panels.push({
"name": "auth",
"rows": [
[{"name": "authMethod"}, false]
@@ -281,6 +285,24 @@ class UserEditRecordView extends EditRecordView {
});
}
+ let hasTab = false;
+
+ for (const [i, panel] of layout.entries()) {
+ if (panel.tabBreak && i > 0) {
+ layout.splice(i, 0, ...panels);
+
+ hasTab = true;
+
+ break;
+ }
+ }
+
+ if (!hasTab) {
+ layout.push(...panels);
+ }
+
+ this.detailLayout = layout;
+
const gridLayout = {
type: 'record',
layout: this.convertDetailLayout(layout),