From 97337b67298d132a006f62d9fee0df0e3dc6c3cb Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Fri, 24 Jan 2020 05:57:05 -0700
Subject: [PATCH] Get at least the nm header showing up

---
 api/js/etemplate/et2_extension_nextmatch.js | 9 ++++++---
 api/js/etemplate/et2_extension_nextmatch.ts | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/api/js/etemplate/et2_extension_nextmatch.js b/api/js/etemplate/et2_extension_nextmatch.js
index dbaa66a36e..0e0dfc7144 100644
--- a/api/js/etemplate/et2_extension_nextmatch.js
+++ b/api/js/etemplate/et2_extension_nextmatch.js
@@ -91,6 +91,9 @@ 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.activeFilters = { col_filter: {} };
+        _this.columns = [];
+        // keeps sorted columns
+        _this.sortedColumnsList = [];
         // Directly set current col_filters from settings
         jQuery.extend(_this.activeFilters.col_filter, _this.options.settings.col_filter);
         /*
@@ -125,8 +128,6 @@ var et2_nextmatch = /** @class */ (function (_super_1) {
         // instance, which can first be created once we have the columns
         _this.controller = null;
         _this.rowProvider = null;
-        // keeps sorted columns
-        _this.sortedColumnsList = [];
         return _this;
     }
     /**
@@ -2594,6 +2595,8 @@ et2_core_widget_1.et2_register_widget(et2_nextmatch_header, ['nextmatch-header']
  * Extend header to process customfields
  *
  * @augments et2_customfields_list
+ *
+ * TODO This should extend customfield widget when it's ready
  */
 var et2_nextmatch_customfields = /** @class */ (function (_super_1) {
     __extends(et2_nextmatch_customfields, _super_1);
@@ -2768,7 +2771,7 @@ var et2_nextmatch_customfields = /** @class */ (function (_super_1) {
         return name;
     };
     return et2_nextmatch_customfields;
-}(et2_customfields_list));
+}(et2_container));
 exports.et2_nextmatch_customfields = et2_nextmatch_customfields;
 et2_core_widget_1.et2_register_widget(et2_nextmatch_customfields, ['nextmatch-customfields']);
 /**
diff --git a/api/js/etemplate/et2_extension_nextmatch.ts b/api/js/etemplate/et2_extension_nextmatch.ts
index d2815f4770..d4cc0b47b1 100644
--- a/api/js/etemplate/et2_extension_nextmatch.ts
+++ b/api/js/etemplate/et2_extension_nextmatch.ts
@@ -228,6 +228,9 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 		super(_parent, _attrs, ClassWithAttributes.extendAttributes(et2_nextmatch._attributes, _child || {}));
 
 		this.activeFilters = {col_filter:{}};
+		this.columns = [];
+		// keeps sorted columns
+		this.sortedColumnsList = [];
 
 		// Directly set current col_filters from settings
 		jQuery.extend(this.activeFilters.col_filter, this.options.settings.col_filter);
@@ -275,8 +278,6 @@ export class et2_nextmatch extends et2_DOMWidget implements et2_IResizeable, et2
 		this.controller = null;
 		this.rowProvider = null;
 
-		// keeps sorted columns
-		this.sortedColumnsList = [];
 	}
 
 	/**
@@ -3369,8 +3370,10 @@ et2_register_widget(et2_nextmatch_header, ['nextmatch-header']);
  * Extend header to process customfields
  *
  * @augments et2_customfields_list
+ *
+ * TODO This should extend customfield widget when it's ready
  */
-export class et2_nextmatch_customfields extends et2_customfields_list implements et2_INextmatchHeader
+export class et2_nextmatch_customfields extends et2_container implements et2_INextmatchHeader
 {
 	static readonly _attributes: {
 		'customfields': {