[FIX] web_refresher: new record refresh

This commit is contained in:
Taras Shabaranskyi
2024-07-21 02:51:21 +03:00
parent c177834d57
commit 324c5ea02d
4 changed files with 23 additions and 16 deletions

View File

@@ -12,16 +12,23 @@ ControlPanel.components = Object.assign({}, ControlPanel.components, {
Refresher,
});
/**
* @property {String[]} forbiddenSubTypes
* @property {Object<String, *>} refresherProps
*/
patch(ControlPanel.prototype, "web_refresher.ControlPanel", {
setup() {
this._super(...arguments);
const {config, searchModel} = this.env;
const forbiddenSubType = ["base_settings"];
if (!forbiddenSubType.includes(config.viewSubType)) {
this.refresherProps = {
searchModel: searchModel,
pagerProps: this.pagerProps,
};
}
this.forbiddenSubTypes = ["base_settings"];
this.refresherProps = {
searchModel: this.env.searchModel,
pagerProps: this.pagerProps,
};
},
/**
* @returns {Boolean}
*/
get displayRefresher() {
return !this.forbiddenSubTypes.includes(this.env.config.viewSubType);
},
});

View File

@@ -89,9 +89,9 @@ export class Refresher extends Component {
* @returns {Promise<Boolean>}
*/
async refresh() {
let updated = this._searchModelRefresh();
let updated = await this._pagerRefresh();
if (!updated) {
updated = await this._pagerRefresh();
updated = this._searchModelRefresh();
}
return updated;
}