extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 09:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Port b6020ad from asig2016 to master

Browse Source
This commit is contained in:
nathangray 2020-04-09 12:39:16 -06:00
parent 26a17011b9
commit bac1ff5a1d
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/js/etemplate/et2_extension_nextmatch.js
View File

@ -847,14 +847,18 @@ var et2_nextmatch = /** @class */ (function (_super) {
// If a custom field column was added, throw away cache to deal with // If a custom field column was added, throw away cache to deal with
// efficient apps that didn't send all custom fields in the first request // efficient apps that didn't send all custom fields in the first request
var cf_added = jQuery(changed).filter(jQuery(custom_fields)).length > 0; var cf_added = jQuery(changed).filter(jQuery(custom_fields)).length > 0;
// Save visible columns // Save visible columns and sizes if selectcols is not emtpy (an empty selectcols actually deletes the prefrence)
if (!jQuery.isEmptyObject(this.activeFilters.selectcols)) {
// 'nextmatch-' prefix is there in preference name, but not in setting, so add it in // 'nextmatch-' prefix is there in preference name, but not in setting, so add it in
this.egw().set_preference(app, pref, this.activeFilters.selectcols.join(","), this.egw().set_preference(app, pref, this.activeFilters.selectcols.join(","),
// Use callback after the preference gets set to trigger refresh, in case app // Use callback after the preference gets set to trigger refresh, in case app
// isn't looking at selectcols and just uses preference // isn't looking at selectcols and just uses preference
cf_added ? jQuery.proxy(function () { if (this.controller) cf_added ? jQuery.proxy(function () { if (this.controller)
this.controller.update(true); }, this) : null); this.controller.update(true); }, this) : null);
// Save adjusted column sizes // Save adjusted column sizes and inform user about it
this.egw().set_preference(app, pref + "-size", colSize);
this.egw().message(this.egw().lang("Saved column sizes to preferences."));
}
this.egw().set_preference(app, pref + "-size", colSize); this.egw().set_preference(app, pref + "-size", colSize);
// No significant change (just normal columns shown) and no need to wait, // No significant change (just normal columns shown) and no need to wait,
// but the grid still needs to be redrawn if a custom field was removed because // but the grid still needs to be redrawn if a custom field was removed because

10
api/js/etemplate/et2_extension_nextmatch.ts
View File

@ -1186,15 +1186,19 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
// efficient apps that didn't send all custom fields in the first request // efficient apps that didn't send all custom fields in the first request
const cf_added = jQuery(changed).filter(jQuery(custom_fields)).length > 0; const cf_added = jQuery(changed).filter(jQuery(custom_fields)).length > 0;
// Save visible columns // Save visible columns and sizes if selectcols is not emtpy (an empty selectcols actually deletes the prefrence)
if(!jQuery.isEmptyObject(this.activeFilters.selectcols))
{
// 'nextmatch-' prefix is there in preference name, but not in setting, so add it in // 'nextmatch-' prefix is there in preference name, but not in setting, so add it in
this.egw().set_preference(app, pref, this.activeFilters.selectcols.join(","), this.egw().set_preference(app, pref, this.activeFilters.selectcols.join(","),
// Use callback after the preference gets set to trigger refresh, in case app // Use callback after the preference gets set to trigger refresh, in case app
// isn't looking at selectcols and just uses preference // isn't looking at selectcols and just uses preference
cf_added ? jQuery.proxy(function() {if(this.controller) this.controller.update(true);}, this):null cf_added ? jQuery.proxy(function() {if(this.controller) this.controller.update(true);}, this):null
); );
// Save adjusted column sizes and inform user about it
// Save adjusted column sizes this.egw().set_preference(app, pref+"-size", colSize);
this.egw().message(this.egw().lang("Saved column sizes to preferences."));
}
this.egw().set_preference(app, pref+"-size", colSize); this.egw().set_preference(app, pref+"-size", colSize);
// No significant change (just normal columns shown) and no need to wait, // No significant change (just normal columns shown) and no need to wait,