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

Check to see if a history (list of) widget has matching select options before trying to use it as a list of widgets for a multi-part value. Should fix history problems with select options where one option is a widget name.

Browse Source
This commit is contained in:
nathangray 2019-04-18 11:42:06 -06:00
parent 2f9101ad7b
commit e67e8672df
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
api/js/etemplate/et2_widget_historylog.js
View File

@ -352,18 +352,22 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
var field = attrs.type || this.options.value['status-widgets'][key];
var options = null;
var widget = null;
// If field has multiple parts (is object) and isn't an obvious select box
if(typeof field == 'object')
{
// Check for multi-part statuses needing multiple widgets
var need_box = false;
for(var j in field)
if(!this.getArrayMgr('sel_options').getEntry(key))
{
// Require widget to be a valueWidget, to avoid invalid widgets
// (and template, which is a widget and an infolog todo status)
if(et2_registry[field[j]] && et2_registry[field[j]].prototype.instanceOf(et2_valueWidget))
for(var j in field)
{
need_box = true;
break;
// Require widget to be a valueWidget, to avoid invalid widgets
// (and template, which is a widget and an infolog todo status)
if(et2_registry[field[j]] && et2_registry[field[j]].prototype.instanceOf(et2_valueWidget))
{
need_box = true;
break;
}
}
}
if(need_box)