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

Get less errors for nextmatch

Browse Source
This commit is contained in:
nathangray 2020-01-24 06:43:08 -07:00
parent 7230ed138c
commit 185ea88613
2 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,6 +90,7 @@ var et2_nextmatch = /** @class */ (function (_super_1) {
*/
function et2_nextmatch(_parent, _attrs, _child) {
var _this = _super_1.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_nextmatch._attributes, _child || {})) || this;
_this.createNamespace = true;
_this.activeFilters = { col_filter: {} };
_this.columns = [];
// keeps sorted columns
@ -1397,7 +1398,9 @@ var et2_nextmatch = /** @class */ (function (_super_1) {
this.dataview = new et2_dataview(this.innerDiv, this.egw());
}
// Create the template
var template = et2_createWidget("template", { "id": template_name }, this);
if (template_name) {
var template = et2_createWidget("template", { "id": template_name }, this);
}
if (!template) {
this.egw().debug("error", "Error while loading definition template for " +
"nextmatch widget.", template_name);
@ -2007,6 +2010,7 @@ var et2_nextmatch = /** @class */ (function (_super_1) {
"default": {}
}
};
et2_nextmatch.legacyOptions = ["template", "hide_header", "header_left", "header_right"];
return et2_nextmatch;
}(et2_core_DOMWidget_1.et2_DOMWidget));
exports.et2_nextmatch = et2_nextmatch;
@ -2256,6 +2260,8 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super_1) {
existing.destroy();
this.headers[id] = null;
}
if (!template_name)
return;
// Load the template
var self = this;
var header = et2_createWidget("template", { "id": template_name }, this);
@ -2292,6 +2298,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super_1) {
* @param {object} extra
*/
et2_nextmatch_header_bar.prototype._build_select = function (name, type, value, lang, extra) {
var _a;
var widget_options = jQuery.extend({
"id": name,
"label": this.nextmatch.options.settings[name + "_label"],
@ -2307,7 +2314,7 @@ var et2_nextmatch_header_bar = /** @class */ (function (_super_1) {
options = this.nextmatch.getArrayMgr("sel_options").getEntry(name);
// Check parent sel_options, because those are usually global and don't get passed down
if (!options)
options = this.nextmatch.getArrayMgr("sel_options").parentMgr.getEntry(name);
options = (_a = this.nextmatch.getArrayMgr("sel_options").getParentMgr()) === null || _a === void 0 ? void 0 : _a.getEntry(name);
// Sometimes legacy stuff puts it in here
if (!options)
options = mgr.getEntry('rows[sel_options][' + name + ']');
@ -2596,7 +2603,7 @@ et2_core_widget_1.et2_register_widget(et2_nextmatch_header, ['nextmatch-header']
*
* @augments et2_customfields_list
*
* TODO This should extend customfield widget when it's ready
* TODO This should extend customfield widget when it's ready, put the whole column in constructor() back too
*/
var et2_nextmatch_customfields = /** @class */ (function (_super_1) {
__extends(et2_nextmatch_customfields, _super_1);
@ -2606,10 +2613,9 @@ var et2_nextmatch_customfields = /** @class */ (function (_super_1) {
* @memberOf et2_nextmatch_customfields
*/
function et2_nextmatch_customfields(_parent, _attrs, _child) {
var _this = _super_1.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_nextmatch_customfields._attributes, _child || {})) || this;
return _super_1.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_nextmatch_customfields._attributes, _child || {})) || this;
// Specifically take the whole column
_this.table.css("width", "100%");
return _this;
// this.table.css("width", "100%");
}
et2_nextmatch_customfields.prototype.destroy = function () {
this.nextmatch = null;

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

@ -181,8 +181,8 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
// Popup to select columns
private selectPopup: any;
legacyOptions: ["template","hide_header","header_left","header_right"];
createNamespace: true;
public static legacyOptions = ["template","hide_header","header_left","header_right"];
createNamespace : boolean = true;
private template: any;
columns: {widget: et2_widget}[];
@ -1875,14 +1875,11 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
*
* @param {string} _value template name
*/
set_template( template_name : string)
{
if(this.template)
{
set_template( template_name : string) {
if (this.template) {
// Stop early to prevent unneeded processing, and prevent infinite
// loops if the server changes the template in get_rows
if(this.template == template_name)
{
if (this.template == template_name) {
return;
}
@ -1894,10 +1891,9 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
// Free any children from previous template
// They may get left behind because of how detached nodes are processed
// We don't use iterateOver because it checks sub-children
for(var i = this._children.length-1; i >=0 ; i--)
{
for (var i = this._children.length - 1; i >= 0; i--) {
var _node = this._children[i];
if(_node != this.header) {
if (_node != this.header) {
this.removeChild(_node);
_node.destroy();
}
@ -1905,15 +1901,17 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
// Clear this setting if it's the same as the template, or
// the columns will not be loaded
if(this.template == this.options.settings.columnselection_pref)
{
if (this.template == this.options.settings.columnselection_pref) {
this.options.settings.columnselection_pref = template_name;
}
this.dataview = new et2_dataview(this.innerDiv, this.egw());
}
// Create the template
var template = et2_createWidget("template", {"id": template_name}, this);
if (template_name)
{
var template = et2_createWidget("template", {"id": template_name}, this);
}
if (!template)
{
@ -2953,6 +2951,7 @@ class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INextmatchHe
(<et2_widget><unknown>existing).destroy();
this.headers[id] = null;
}
if(!template_name) return;
// Load the template
var self = this;
@ -3007,7 +3006,7 @@ class et2_nextmatch_header_bar extends et2_DOMWidget implements et2_INextmatchHe
// Look in sel_options
if(!options) options = this.nextmatch.getArrayMgr("sel_options").getEntry(name);
// Check parent sel_options, because those are usually global and don't get passed down
if(!options) options = this.nextmatch.getArrayMgr("sel_options").parentMgr.getEntry(name);
if(!options) options = this.nextmatch.getArrayMgr("sel_options").getParentMgr()?.getEntry(name);
// Sometimes legacy stuff puts it in here
if(!options) options = mgr.getEntry('rows[sel_options]['+name+']');
@ -3371,7 +3370,7 @@ et2_register_widget(et2_nextmatch_header, ['nextmatch-header']);
*
* @augments et2_customfields_list
*
* TODO This should extend customfield widget when it's ready
* TODO This should extend customfield widget when it's ready, put the whole column in constructor() back too
*/
export class et2_nextmatch_customfields extends et2_container implements et2_INextmatchHeader
{
@ -3396,7 +3395,7 @@ export class et2_nextmatch_customfields extends et2_container implements et2_INe
super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_nextmatch_customfields._attributes, _child || {}));
// Specifically take the whole column
this.table.css("width", "100%");
// this.table.css("width", "100%");
}
destroy( )