From d361206090cf876751dd8ff44346df2d2f68d865 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 25 Mar 2013 22:04:10 +0000 Subject: [PATCH] Always send app:id or just id from nextmatch_entryheader, instead of seperated properties --- etemplate/js/et2_extension_nextmatch.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/etemplate/js/et2_extension_nextmatch.js b/etemplate/js/et2_extension_nextmatch.js index 69210c857e..67f89e1899 100644 --- a/etemplate/js/et2_extension_nextmatch.js +++ b/etemplate/js/et2_extension_nextmatch.js @@ -1911,6 +1911,19 @@ var et2_nextmatch_entryheader = et2_link_entry.extend(et2_INextmatchHeader, { this.nextmatch.applyFilters(); }, + /** + * Override to always return a string appname:id (or just id), parent returns an object + */ + getValue: function() { + var value = this._super.apply(this, arguments); + if(typeof value == "object" && value != null) + { + if(!value.app || !value.id) return null; + value = value.app +":"+value.id; + } + return value + }, + /** * Set nextmatch is the function which has to be implemented for the * et2_INextmatchHeader interface. @@ -1925,7 +1938,7 @@ var et2_nextmatch_entryheader = et2_link_entry.extend(et2_INextmatchHeader, { // Tell framework to ignore, or it will reset it to ''/empty when it does loadingFinished() this.attributes.value.ignore = true; - this.attributes.select_options.ignore = true; + //this.attributes.select_options.ignore = true; } var self = this; // Fire on lost focus, clear filter if user emptied box