');
diff --git a/client/src/views/fields/link-multiple-with-role.js b/client/src/views/fields/link-multiple-with-role.js
index 573debbf23..607454fda9 100644
--- a/client/src/views/fields/link-multiple-with-role.js
+++ b/client/src/views/fields/link-multiple-with-role.js
@@ -70,7 +70,7 @@ Espo.define('views/fields/link-multiple-with-role', 'views/fields/link-multiple'
},
getDetailLinkHtml: function (id, name) {
- name = name || this.nameHash[id];
+ name = name || this.nameHash[id] || id;
if (!name && id) {
name = this.translate(this.foreignScope, 'scopeNames');
}
@@ -158,6 +158,8 @@ Espo.define('views/fields/link-multiple-with-role', 'views/fields/link-multiple'
},
addLinkHtml: function (id, name) {
+ name = name || id;
+
if (this.mode == 'search') {
return Dep.prototype.addLinkHtml.call(this, id, name);
}
diff --git a/client/src/views/fields/link-multiple.js b/client/src/views/fields/link-multiple.js
index a9c962fb56..6659b97294 100644
--- a/client/src/views/fields/link-multiple.js
+++ b/client/src/views/fields/link-multiple.js
@@ -307,6 +307,8 @@ Espo.define('views/fields/link-multiple', 'views/fields/base', function (Dep) {
},
addLinkHtml: function (id, name) {
+ name = name || id;
+
var $container = this.$el.find('.link-container');
var $el = $('
').addClass('link-' + id).addClass('list-group-item').attr('data-id', id);
$el.html(this.getHelper().escapeString(name || id) + ' ');
diff --git a/client/src/views/fields/link-one.js b/client/src/views/fields/link-one.js
index 075bf16034..9a53ff16f2 100644
--- a/client/src/views/fields/link-one.js
+++ b/client/src/views/fields/link-one.js
@@ -26,13 +26,13 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
-Espo.define('views/fields/link-one', 'views/fields/link', function (Dep) {
+define('views/fields/link-one', 'views/fields/link', function (Dep) {
return Dep.extend({
readOnly: true,
- searchTypeList: ['is', 'isOneOf'],
+ searchTypeList: ['is', 'isEmpty', 'isNotEmpty', 'isOneOf'],
fetchSearch: function () {
var type = this.$el.find('select.search-type').val();
@@ -46,12 +46,12 @@ Espo.define('views/fields/link-one', 'views/fields/link', function (Dep) {
data: {
type: type,
oneOfIdList: this.searchData.oneOfIdList,
- oneOfNameHash: this.searchData.oneOfNameHash
- }
+ oneOfNameHash: this.searchData.oneOfNameHash,
+ },
};
return data;
- } else {
+ } else if (type == 'is' || !type) {
if (!value) {
return false;
}
@@ -61,8 +61,26 @@ Espo.define('views/fields/link-one', 'views/fields/link', function (Dep) {
value: value,
data: {
type: type,
- nameValue: this.$el.find('[data-name="' + this.nameName + '"]').val()
- }
+ nameValue: this.$el.find('[data-name="' + this.nameName + '"]').val(),
+ },
+ };
+ return data;
+
+ } else if (type === 'isEmpty') {
+ var data = {
+ type: 'isNotLinked',
+ data: {
+ type: type,
+ },
+ };
+ return data;
+
+ } else if (type === 'isNotEmpty') {
+ var data = {
+ type: 'isLinked',
+ data: {
+ type: type,
+ },
};
return data;
}
diff --git a/client/src/views/fields/link-parent.js b/client/src/views/fields/link-parent.js
index c1884ded1c..18223007b1 100644
--- a/client/src/views/fields/link-parent.js
+++ b/client/src/views/fields/link-parent.js
@@ -186,7 +186,7 @@ Espo.define('views/fields/link-parent', 'views/fields/base', function (Dep) {
},
select: function (model) {
- this.$elementName.val(model.get('name'));
+ this.$elementName.val(model.get('name') || model.id);
this.$elementId.val(model.get('id'));
this.trigger('change');
},
diff --git a/client/src/views/fields/link.js b/client/src/views/fields/link.js
index df33b3c353..166497b09d 100644
--- a/client/src/views/fields/link.js
+++ b/client/src/views/fields/link.js
@@ -167,11 +167,11 @@ Espo.define('views/fields/link', 'views/fields/base', function (Dep) {
},
select: function (model) {
- this.$elementName.val(model.get('name'));
+ this.$elementName.val(model.get('name') || model.id);
this.$elementId.val(model.get('id'));
if (this.mode === 'search') {
this.searchData.idValue = model.get('id');
- this.searchData.nameValue = model.get('name');
+ this.searchData.nameValue = model.get('name') || model.id;
}
this.trigger('change');
},
diff --git a/client/src/views/fields/wysiwyg.js b/client/src/views/fields/wysiwyg.js
index 9b751036de..54a230693f 100644
--- a/client/src/views/fields/wysiwyg.js
+++ b/client/src/views/fields/wysiwyg.js
@@ -71,7 +71,7 @@ define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], function
['para', ['ul', 'ol', 'paragraph']],
['height', ['height']],
['table', ['table', 'espoLink', 'espoImage', 'hr']],
- ['misc',['codeview', 'fullscreen']]
+ ['misc', ['codeview', 'fullscreen']]
];
this.buttons = {};
@@ -368,6 +368,8 @@ define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], function
keyMap.pc['CTRL+K'] = 'espoLink.show';
keyMap.mac['CMD+K'] = 'espoLink.show';
+ var toolbar = this.toolbar;
+
var options = {
espoView: this,
lang: this.getConfig().get('language'),
@@ -408,7 +410,7 @@ define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], function
onCreateLink: function (link) {
return link;
},
- toolbar: this.toolbar,
+ toolbar: toolbar,
buttons: this.buttons,
dialogsInBody: this.$el,
codeviewFilter: true,
@@ -710,6 +712,81 @@ define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], function
}
},
+ 'fullscreen': function (context) {
+ var ui = $.summernote.ui;
+ var options = context.options;
+ var self = options.espoView;
+ var lang = options.langInfo;
+
+ this.$window = $(window);
+ this.$scrollbar = $('html, body');
+
+ this.initialize = function () {
+ this.$editor = context.layoutInfo.editor;
+ this.$toolbar = context.layoutInfo.toolbar;
+ this.$editable = context.layoutInfo.editable;
+ this.$codable = context.layoutInfo.codable;
+
+ this.$modal = self.$el.closest('.modal');
+ this.isInModal = this.$modal.length > 0;
+ };
+
+ this.resizeTo = function (size) {
+ this.$editable.css('height', size.h);
+ this.$codable.css('height', size.h);
+ if (this.$codable.data('cmeditor')) {
+ this.$codable.data('cmeditor').setsize(null, size.h);
+ }
+ };
+
+ this.onResize = function () {
+ this.resizeTo({
+ h: this.$window.height() - this.$toolbar.outerHeight(),
+ });
+ };
+
+ this.isFullscreen = function () {
+ return this.$editor.hasClass('fullscreen');
+ };
+
+ this.destroy = function () {
+ this.$window.off('resize.summernote' + self.cid);
+ if (this.isInModal) {
+ this.$modal.css('overflow-y', '');
+ } else {
+ this.$scrollbar.css('overflow', '');
+ }
+ }
+
+ this.toggle = function () {
+ this.$editor.toggleClass('fullscreen');
+ if (this.isFullscreen()) {
+ this.$editable.data('orgHeight', this.$editable.css('height'));
+ this.$editable.data('orgMaxHeight', this.$editable.css('maxHeight'));
+ this.$editable.css('maxHeight', '');
+ this.$window.on('resize.summernote' + self.cid, this.onResize.bind(this)).trigger('resize');
+ if (this.isInModal) {
+ this.$modal.css('overflow-y', 'hidden');
+ } else {
+ this.$scrollbar.css('overflow', 'hidden');
+ }
+ this._isFullscreen = true;
+ } else {
+ this.$window.off('resize.summernote' + self.cid);
+ this.resizeTo({ h: this.$editable.data('orgHeight') });
+ this.$editable.css('maxHeight', this.$editable.css('orgMaxHeight'));
+ if (this.isInModal) {
+ this.$modal.css('overflow-y', '');
+ } else {
+ this.$scrollbar.css('overflow', '');
+ }
+ this._isFullscreen = false;
+ }
+
+ context.invoke('toolbar.updateFullscreen', this.isFullscreen());
+ };
+ },
+
});
},
});
diff --git a/client/src/views/modals/image-preview.js b/client/src/views/modals/image-preview.js
index 6ca6c5f68c..ba8f29999f 100644
--- a/client/src/views/modals/image-preview.js
+++ b/client/src/views/modals/image-preview.js
@@ -53,7 +53,7 @@ Espo.define('views/modals/image-preview', ['views/modal', 'lib!exif'], function
name: this.options.name,
url: this.getImageUrl(),
originalUrl: this.getOriginalImageUrl(),
- size: this.size
+ showOriginalLink: this.size,
};
},
@@ -99,7 +99,9 @@ Espo.define('views/modals/image-preview', ['views/modal', 'lib!exif'], function
$img.on('load', function () {
var self = this;
- EXIF.getData($img.get(0), function () {
+ var imgEl = $img.get(0);
+
+ EXIF.getData(imgEl, function () {
var orientation = EXIF.getTag(this, 'Orientation');
switch (orientation) {
case 2:
@@ -128,6 +130,10 @@ Espo.define('views/modals/image-preview', ['views/modal', 'lib!exif'], function
break;
}
});
+
+ if (imgEl.naturalWidth > imgEl.clientWidth) {
+ this.$el.find('.original-link-container').removeClass('hidden');
+ }
}.bind(this));
if (this.navigationEnabled) {