holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Infolog: Fix CRM view would overwrite state in infolog list, leading to wrong filters in favorites

Browse Source
This commit is contained in:
nathangray 2021-03-22 11:35:24 -06:00
parent afd2364979
commit 66a0454936
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infolog/js/app.js
View File

@ -253,12 +253,15 @@ var InfologApp = /** @class */ (function (_super) {
* @return {object} Application specific map representing the current state * @return {object} Application specific map representing the current state
*/ */
InfologApp.prototype.getState = function () { InfologApp.prototype.getState = function () {
// call parent var state = {
var state = _super.prototype.getState.call(this); action: null,
action_id: null
};
var nm = {}; var nm = {};
// Get index etemplate // Get index etemplate
var et2 = etemplate2_1.etemplate2.getById('infolog-index'); var et2 = etemplate2_1.etemplate2.getById('infolog-index');
if (et2) { if (et2) {
state = et2.widgetContainer.getWidgetById("nm").getValue();
var content = et2.widgetContainer.getArrayMgr('content'); var content = et2.widgetContainer.getArrayMgr('content');
nm = content && content.data && content.data.nm ? content.data.nm : {}; nm = content && content.data && content.data.nm ? content.data.nm : {};
} }

11
infolog/js/app.ts
View File

@ -277,15 +277,18 @@ class InfologApp extends EgwApp
*/ */
getState() getState()
{ {
// call parent let state = {
var state = super.getState(); action: null,
var nm : any = {}; action_id: null
};
let nm : any = {};
// Get index etemplate // Get index etemplate
var et2 = etemplate2.getById('infolog-index'); var et2 = etemplate2.getById('infolog-index');
if(et2) if(et2)
{ {
var content = et2.widgetContainer.getArrayMgr('content'); state = et2.widgetContainer.getWidgetById("nm").getValue();
let content = et2.widgetContainer.getArrayMgr('content');
nm = content && content.data && content.data.nm ? content.data.nm: {}; nm = content && content.data && content.data.nm ? content.data.nm: {};
} }