This commit is contained in:
Yuri Kuznetsov
2023-07-27 11:44:47 +03:00
parent 4bba92cdac
commit 73121fadf7
4 changed files with 17 additions and 17 deletions
+4 -4
View File
@@ -61,8 +61,8 @@ class ActionHistoryModalView extends ModalView {
collection.maxSize = this.getConfig().get('recordsPerPage') || 20;
this.collection = collection;
this.loadSearch();
this.loadList();
this.setupSearch();
this.setupList();
collection.fetch();
});
@@ -74,7 +74,7 @@ class ActionHistoryModalView extends ModalView {
this.close();
}
loadSearch() {
setupSearch() {
let searchManager = this.searchManager =
new SearchManager(this.collection, 'listSelect', null, this.getDateTime());
@@ -90,7 +90,7 @@ class ActionHistoryModalView extends ModalView {
});
}
loadList() {
setupList() {
let viewName = this.getMetadata().get(`clientDefs.${this.scope}.recordViews.list`) ||
'views/record/list';
+7 -7
View File
@@ -298,11 +298,11 @@ class RelatedListModalView extends ModalView {
});
}
this.loadSearch();
this.setupSearch();
this.wait(true);
this.loadList();
this.setupList();
});
}
@@ -318,7 +318,7 @@ class RelatedListModalView extends ModalView {
return this.getView('search');
}
loadSearch() {
setupSearch() {
let searchManager = this.searchManager =
new SearchManager(this.collection, 'listSelect', null, this.getDateTime());
@@ -375,7 +375,7 @@ class RelatedListModalView extends ModalView {
}
}
loadList() {
setupList() {
let viewName =
this.listViewName ||
this.getMetadata().get(['clientDefs', this.scope, 'recordViews', 'listRelated']) ||
@@ -402,7 +402,7 @@ class RelatedListModalView extends ModalView {
this.getMetadata().get(['clientDefs', this.scope, 'listPagination']) ||
null,
}, view => {
this.listenToOnce(view, 'select', (model) => {
this.listenToOnce(view, 'select', model => {
this.trigger('select', model);
this.close();
@@ -432,7 +432,7 @@ class RelatedListModalView extends ModalView {
return;
}
view.getSelectAttributeList((selectAttributeList) => {
view.getSelectAttributeList(selectAttributeList => {
if (!~selectAttributeList.indexOf('name')) {
selectAttributeList.push('name');
}
@@ -440,7 +440,7 @@ class RelatedListModalView extends ModalView {
let mandatorySelectAttributeList = this.options.mandatorySelectAttributeList ||
this.mandatorySelectAttributeList || [];
mandatorySelectAttributeList.forEach((attribute) => {
mandatorySelectAttributeList.forEach(attribute => {
if (!~selectAttributeList.indexOf(attribute)) {
selectAttributeList.push(attribute);
}
+4 -4
View File
@@ -182,13 +182,13 @@ class SelectRecordsModalView extends ModalView {
this.collection.setOrder(this.defaultOrderBy, this.defaultOrder || 'asc', true);
}
this.loadSearch();
this.setupSearch();
this.wait(true);
this.loadList();
this.setupList();
});
}
loadSearch() {
setupSearch() {
let searchManager = this.searchManager =
new SearchManager(this.collection, 'listSelect', null, this.getDateTime());
@@ -233,7 +233,7 @@ class SelectRecordsModalView extends ModalView {
}
}
loadList() {
setupList() {
let viewName = this.getMetadata().get('clientDefs.' + this.scope + '.recordViews.listSelect') ||
this.getMetadata().get('clientDefs.' + this.scope + '.recordViews.list') ||
'views/record/list';
+2 -2
View File
@@ -35,8 +35,8 @@ class SelectTemplateModalView extends SelectRecordsModalView {
searchPanel = false
scope = 'Template'
loadSearch() {
super.loadSearch();
setupSearch() {
super.setupSearch();
this.searchManager.setAdvanced({
entityType: {