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

fix not displayed history of deleted object with new_value === null

Browse Source
This commit is contained in:
Ralf Becker 2019-03-19 11:11:38 +01:00
parent 934fe74fa2
commit 6e5fbbba7e
1 changed files with 8 additions and 8 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

@ -7,16 +7,15 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Nathan Gray * @author Nathan Gray
* @copyright 2012 Nathan Gray * @copyright 2012 Nathan Gray
* @version $Id$
*/ */
/*egw:uses /*egw:uses
/vendor/bower-asset/jquery/dist/jquery.js; /vendor/bower-asset/jquery/dist/jquery.js;
/vendor/bower-asset/jquery-ui/jquery-ui.js; /vendor/bower-asset/jquery-ui/jquery-ui.js;
et2_core_valueWidget; et2_core_valueWidget;
// Include the grid classes // Include the grid classes
et2_dataview; et2_dataview;
*/ */
/** /**
@ -529,7 +528,8 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
else if (( else if ((
// Already parsed & cached // Already parsed & cached
typeof _data[self.columns[self.NEW_VALUE].id] == "object" && typeof _data[self.columns[self.NEW_VALUE].id] == "object" &&
typeof _data[self.columns[self.NEW_VALUE].id].new != "undefined") || typeof _data[self.columns[self.NEW_VALUE].id] != "undefined" &&
_data[self.columns[self.NEW_VALUE].id] !== null) || // typeof null === 'object'
// Large old value // Large old value
self._needsDiffWidget(_data['status'], _data[self.columns[self.OLD_VALUE].id]) || self._needsDiffWidget(_data['status'], _data[self.columns[self.OLD_VALUE].id]) ||
// Large new value // Large new value
@ -560,7 +560,7 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
else else
{ {
// No widget fallback - display actual value // No widget fallback - display actual value
nodes = '<span>'+ value + '</span>'; nodes = jQuery('<span>').text(value === null ? '' : value);
} }
if(widget) if(widget)
{ {
@ -600,7 +600,7 @@ var et2_historylog = (function(){ "use strict"; return et2_valueWidget.extend([e
this.egw().debug("warn", "Crazy diff value", value); this.egw().debug("warn", "Crazy diff value", value);
return false; return false;
} }
return value=== '***diff***'; return value === '***diff***';
}, },
resize: function (_height) resize: function (_height)