extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-23 05:41:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Be more accepting of row categories - can be in ID cat, cat_id or category. cat_id is preferred, as it matches the nm filter

Browse Source
This commit is contained in:
Nathan Gray 2012-07-25 20:53:42 +00:00
parent c2ed51de76
commit a6cd169d47
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etemplate/js/et2_extension_nextmatch_rowProvider.js
View File

@ -435,6 +435,11 @@ var et2_nextmatch_rowProvider = Class.extend({
// Assume any numeric class is a category // Assume any numeric class is a category
if(_data["class"].indexOf("cat") !== -1 || classes.match(/[0-9]+/)) if(_data["class"].indexOf("cat") !== -1 || classes.match(/[0-9]+/))
{ {
// Accept either cat, cat_id or category as ID, and look there for category settings
var category_location = _data["class"].match(/(cat(_id|egory)?)/);
if(category_location) category_location = category_location[0];
// Get actual category
cats = classes.match(/(cat_)?([0-9]+)/); cats = classes.match(/(cat_)?([0-9]+)/);
if(cats == null) if(cats == null)
{ {
@ -450,9 +455,11 @@ var et2_nextmatch_rowProvider = Class.extend({
// Get category info // Get category info
if(!this.categories) if(!this.categories)
{ {
// Nextmatch category filter should put them here
var categories = _mgrs["sel_options"].getEntry('cat_id'); var categories = _mgrs["sel_options"].getEntry('cat_id');
if(!categories) categories = _mgrs["sel_options"].parentMgr.getEntry('cat_id'); // If not using category (tracker, calendar list) look for sel_options in the rows
if(!categories) categories = _mgrs["sel_options"].getEntry('${row}'+'[cat_id]'); if(!categories) categories = _mgrs["sel_options"].parentMgr.getEntry(category_location);
if(!categories) categories = _mgrs["sel_options"].getEntry("${row}["+category_location + "]");
// Cache // Cache
if(categories) this.categories = categories; if(categories) this.categories = categories;