From 5419d76080810280ab596ce472e910ff5fe543e2 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 10 Nov 2016 12:58:54 +0200 Subject: [PATCH] link field empty name and audited note change --- client/src/views/fields/link-parent.js | 2 +- client/src/views/fields/link.js | 2 +- client/src/views/stream/notes/update.js | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/client/src/views/fields/link-parent.js b/client/src/views/fields/link-parent.js index 2abb72cde3..9bdb76ab11 100644 --- a/client/src/views/fields/link-parent.js +++ b/client/src/views/fields/link-parent.js @@ -62,7 +62,7 @@ Espo.define('views/fields/link-parent', 'views/fields/base', function (Dep) { nameName: this.nameName, typeName: this.typeName, idValue: this.model.get(this.idName), - nameValue: this.model.get(this.nameName), + nameValue: this.model.has(this.nameName) ? this.model.get(this.nameName) : this.model.get(this.idName), typeValue: this.model.get(this.typeName), foreignScope: this.foreignScope, foreignScopeList: this.foreignScopeList, diff --git a/client/src/views/fields/link.js b/client/src/views/fields/link.js index 60dc89a3b8..6760bdbe96 100644 --- a/client/src/views/fields/link.js +++ b/client/src/views/fields/link.js @@ -61,7 +61,7 @@ Espo.define('views/fields/link', 'views/fields/base', function (Dep) { idName: this.idName, nameName: this.nameName, idValue: this.model.get(this.idName), - nameValue: this.model.get(this.nameName), + nameValue: this.model.has(this.nameName) ? this.model.get(this.nameName) : this.model.get(this.idName), foreignScope: this.foreignScope }, Dep.prototype.data.call(this)); }, diff --git a/client/src/views/stream/notes/update.js b/client/src/views/stream/notes/update.js index 055a89313f..71008d6d91 100644 --- a/client/src/views/stream/notes/update.js +++ b/client/src/views/stream/notes/update.js @@ -26,11 +26,11 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('Views.Stream.Notes.Update', 'Views.Stream.Note', function (Dep) { +Espo.define('views/stream/notes/update', 'views/stream/note', function (Dep) { return Dep.extend({ - template: 'stream.notes.update', + template: 'stream/notes/update', messageName: 'update', @@ -89,7 +89,8 @@ Espo.define('Views.Stream.Notes.Update', 'Views.Stream.Note', function (Dep) { defs: { name: field }, - mode: 'list' + mode: 'detail', + inlineEditDisabled: true }); this.createView(field + 'Became', viewName, { model: modelBecame, @@ -97,7 +98,8 @@ Espo.define('Views.Stream.Notes.Update', 'Views.Stream.Note', function (Dep) { defs: { name: field }, - mode: 'list' + mode: 'detail', + inlineEditDisabled: true }); this.fieldsArr.push({