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

notify messages changes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2020-04-02 11:00:35 +03:00
parent e58132b6b3
commit 7679f019f9
8 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/modules/crm/src/views/call/record/list.js
+7 -5
View File
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('crm:views/call/record/list', 'views/record/list', function (Dep) {
define('crm:views/call/record/list', 'views/record/list', function (Dep) {
return Dep.extend({
@@ -55,9 +55,9 @@ Espo.define('crm:views/call/record/list', 'views/record/list', function (Dep) {
this.collection.fetch();
}, this);
this.notify('Saving...');
model.save();
Espo.Ui.notify(this.translate('loading', 'messages'));
model.save();
},
actionSetNotHeld: function (data) {
@@ -82,7 +82,8 @@ Espo.define('crm:views/call/record/list', 'views/record/list', function (Dep) {
},
massActionSetHeld: function () {
this.notify('Please wait...');
Espo.Ui.notify(this.translate('saving', 'messages'));
var data = {};
data.ids = this.checkedList;
$.ajax({
@@ -103,7 +104,8 @@ Espo.define('crm:views/call/record/list', 'views/record/list', function (Dep) {
},
massActionSetNotHeld: function () {
this.notify('Please wait...');
Espo.Ui.notify(this.translate('saving', 'messages'));
var data = {};
data.ids = this.checkedList;
$.ajax({
client/modules/crm/src/views/meeting/record/list.js
+4 -2
View File
@@ -81,7 +81,8 @@ Espo.define('crm:views/meeting/record/list', 'views/record/list', function (Dep)
},
massActionSetHeld: function () {
this.notify('Please wait...');
Espo.Ui.notify(this.translate('saving', 'messages'));
var data = {};
data.ids = this.checkedList;
$.ajax({
@@ -102,7 +103,8 @@ Espo.define('crm:views/meeting/record/list', 'views/record/list', function (Dep)
},
massActionSetNotHeld: function () {
this.notify('Please wait...');
Espo.Ui.notify(this.translate('saving', 'messages'));
var data = {};
data.ids = this.checkedList;
$.ajax({
client/modules/crm/src/views/record/panels/history.js
+2 -2
View File
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('crm:views/record/panels/history', 'crm:views/record/panels/activities', function (Dep) {
define('crm:views/record/panels/history', 'crm:views/record/panels/activities', function (Dep) {
return Dep.extend({
@@ -163,7 +163,7 @@ Espo.define('crm:views/record/panels/history', 'crm:views/record/panels/activiti
Espo.require('EmailHelper', function (EmailHelper) {
var emailHelper = new EmailHelper(this.getLanguage(), this.getUser(), this.getDateTime(), this.getAcl());
this.notify('Please wait...');
Espo.Ui.notify(this.translate('loading', 'messages'));
this.getModelFactory().create('Email', function (model) {
model.id = id;
client/src/views/list-with-categories.js
+2 -1
View File
@@ -404,7 +404,8 @@ define('views/list-with-categories', 'views/list', function (Dep) {
this.collection.abortLastFetch();
this.notify('Please wait...');
Espo.Ui.notify(this.translate('loading', 'messages'));
this.listenToOnce(this.collection, 'sync', function () {
this.notify(false);
}, this);
client/src/views/modals/select-records-with-categories.js
+2 -2
View File
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('views/modals/select-records-with-categories', ['views/modals/select-records', 'views/list-with-categories'], function (Dep, List) {
define('views/modals/select-records-with-categories', ['views/modals/select-records', 'views/list-with-categories'], function (Dep, List) {
return Dep.extend({
@@ -103,7 +103,7 @@ Espo.define('views/modals/select-records-with-categories', ['views/modals/select
this.applyCategoryToCollection();
this.notify('Please wait...');
Espo.Ui.notify(this.translate('loading', 'messages'));
this.listenToOnce(this.collection, 'sync', function () {
this.notify(false);
}, this);
client/src/views/record/list-tree-item.js
+1 -1
View File
@@ -184,7 +184,7 @@ define('views/record/list-tree-item', 'view', function (Dep) {
collection.parentId = this.model.id;
collection.maxDepth = 1;
this.notify('Please wait...');
Espo.Ui.notify(this.translate('loading', 'messages'));
this.listenToOnce(collection, 'sync', function () {
this.notify(false);
this.model.set('childCollection', collection);
client/src/views/record/list.js
+3 -3
View File
@@ -114,7 +114,7 @@ define('views/record/list', 'view', function (Dep) {
if ($(e.currentTarget).parent().hasClass('disabled')) {
return;
}
this.notify('Please wait...');
Espo.Ui.notify(this.translate('loading', 'messages'));
this.collection.once('sync', function () {
this.notify(false);
}.bind(this));
@@ -166,7 +166,7 @@ define('views/record/list', 'view', function (Dep) {
}
var order = asc ? 'asc' : 'desc';
this.notify('Please wait...');
Espo.Ui.notify(this.translate('loading', 'messages'));
this.collection.once('sync', function () {
this.notify(false);
this.trigger('sort', {orderBy: orderBy, order: order});
@@ -702,7 +702,7 @@ define('views/record/list', 'view', function (Dep) {
this.listenToOnce(view, 'select', function (templateModel) {
this.clearView('pdfTemplate');
Espo.Ui.notify(this.translate('pleaseWait', 'messages'));
Espo.Ui.notify(this.translate('loading', 'messages'));
this.ajaxPostRequest('Pdf/action/massPrint', {
idList: idList,
entityType: this.entityType,
client/src/views/record/panels/relationship.js
+1 -1
View File
@@ -517,7 +517,7 @@ Espo.define('views/record/panels/relationship', ['views/record/panels/bottom', '
actionUnlinkAllRelated: function (data) {
this.confirm(this.translate('unlinkAllConfirmation', 'messages'), function () {
this.notify('Please wait...');
Espo.Ui.notify(this.translate('pleaseWait', 'messages'));
$.ajax({
url: this.model.name + '/action/unlinkAll',
type: 'POST',