From f8f64412d99bd85b92c07cf52d847b4967e071e9 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Thu, 14 Aug 2025 11:34:36 +0300 Subject: [PATCH] link edit form change --- .../admin/link-manager/modals/edit.tpl | 275 +++++++++--------- .../views/admin/link-manager/modals/edit.js | 22 +- 2 files changed, 152 insertions(+), 145 deletions(-) diff --git a/client/res/templates/admin/link-manager/modals/edit.tpl b/client/res/templates/admin/link-manager/modals/edit.tpl index 95b774f9e5..8325fd558a 100644 --- a/client/res/templates/admin/link-manager/modals/edit.tpl +++ b/client/res/templates/admin/link-manager/modals/edit.tpl @@ -1,142 +1,147 @@ -
+
+
-
-
- -
- {{{entityForeign}}} -
-
-
-
-
- -
- {{{linkType}}} -
-
-
-
-
- -
- {{{linkForeign}}} -
-
-
- {{#if relationName}} - -
- {{{relationName}}} -
- {{/if}} -
-
- -
- {{{link}}} -
-
-
-
-
- -
- {{{labelForeign}}} -
-
-
-
- -
- {{{label}}} -
-
-
-
-
- -
- {{{linkMultipleFieldForeign}}} -
-
-
-
- -
- {{{linkMultipleField}}} -
-
-
-
-
- -
- {{{auditedForeign}}} -
-
-
-
- -
- {{{audited}}} -
-
-
- -
-
- -
- {{{layoutForeign}}} -
-
-
-
- -
- {{{layout}}} -
-
-
- -
-
- -
- {{{selectFilterForeign}}} +
+
+ +
+ {{{entity}}} +
+
+
+ +
+ {{{linkType}}} +
+
+
+ +
+ {{{entityForeign}}} +
-
-
- -
- {{{selectFilter}}} +
+
+ +
+ {{{linkForeign}}} +
+
+
+ {{#if relationName}} + +
+ {{{relationName}}} +
+ {{/if}} +
+
+ +
+ {{{link}}} +
+
+
+
+
+ +
+ {{{labelForeign}}} +
+
+
+
+ +
+ {{{label}}} +
+
+
+
+
+ +
+ {{{linkMultipleFieldForeign}}} +
+
+
+
+ +
+ {{{linkMultipleField}}} +
+
+
+
+
+ +
+ {{{auditedForeign}}} +
+
+
+
+ +
+ {{{audited}}} +
+
+
+ +
+
+ +
+ {{{layoutForeign}}} +
+
+
+
+ +
+ {{{layout}}} +
+
+
+ +
+
+ +
+ {{{selectFilterForeign}}} +
+
+
+
+ +
+ {{{selectFilter}}} +
+
+
+ +
+
+
+ +
+ {{{parentEntityTypeList}}} +
+
+
+
+
+
+ +
+ {{{foreignLinkEntityTypeList}}} +
- -
-
-
- -
- {{{parentEntityTypeList}}} -
-
-
-
-
- -
- {{{foreignLinkEntityTypeList}}} -
-
-
- -
diff --git a/client/src/views/admin/link-manager/modals/edit.js b/client/src/views/admin/link-manager/modals/edit.js index 9d3911b8d8..a1570e2f36 100644 --- a/client/src/views/admin/link-manager/modals/edit.js +++ b/client/src/views/admin/link-manager/modals/edit.js @@ -159,6 +159,7 @@ class LinkManagerEditModalView extends ModalView { } this.model.set('linkType', linkType); + this.model.set('entity', this.scope); this.model.set('entityForeign', entityForeign); this.model.set('link', link); this.model.set('linkForeign', linkForeign); @@ -235,12 +236,15 @@ class LinkManagerEditModalView extends ModalView { entityList.unshift(''); - this.createView('entity', 'views/fields/varchar', { + this.createView('entity', 'views/fields/enum', { model: model, mode: 'edit', selector: '.field[data-name="entity"]', - defs: { - name: 'entity' + name: 'entity', + params: { + required: true, + options: entityList, + translation: 'Global.scopeNames', }, readOnly: true, }); @@ -249,13 +253,11 @@ class LinkManagerEditModalView extends ModalView { model: model, mode: 'edit', selector: '.field[data-name="entityForeign"]', - defs: { - name: 'entityForeign', - params: { - required: true, - options: entityList, - translation: 'Global.scopeNames', - } + name: 'entityForeign', + params: { + required: true, + options: entityList, + translation: 'Global.scopeNames', }, readOnly: !isNew, });