Commit ee45a568 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=25510 - Ошибка в консоли в результате отбора...

http://bugzserver/show_bug.cgi?id=25510 - Ошибка в консоли в результате отбора данных с использованием Custom Filter

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57372 954022d7-b5bf-4e40-9824-e11837661b57
parent 2f218c2d
...@@ -3516,6 +3516,9 @@ var gUndoInsDelCellsFlag = true; ...@@ -3516,6 +3516,9 @@ var gUndoInsDelCellsFlag = true;
var result = []; var result = [];
for(var s = 0; s < arrLog.length; s++) for(var s = 0; s < arrLog.length; s++)
{ {
if(valLog[s] === undefined)
continue;
var checkComplexSymbols = this._parseComplexSpecSymbols(val, arrLog[s], valLog[s],type); var checkComplexSymbols = this._parseComplexSpecSymbols(val, arrLog[s], valLog[s],type);
var filterVal; var filterVal;
if(checkComplexSymbols != null) if(checkComplexSymbols != null)
...@@ -4644,7 +4647,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -4644,7 +4647,7 @@ var gUndoInsDelCellsFlag = true;
result.ColId = colId; result.ColId = colId;
result.CustomFiltersObj = new CustomFilters(); result.CustomFiltersObj = new CustomFilters();
if(valFilter.filter1 && valFilter.valFilter1 != null && valFilter.valFilter1 != undefined) if(valFilter.filter1 && valFilter.valFilter1 !== null)
{ {
result.CustomFiltersObj = new CustomFilters(); result.CustomFiltersObj = new CustomFilters();
result.CustomFiltersObj.CustomFilters = []; result.CustomFiltersObj.CustomFilters = [];
...@@ -4653,7 +4656,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -4653,7 +4656,7 @@ var gUndoInsDelCellsFlag = true;
result.CustomFiltersObj.CustomFilters[0].Val = valFilter.valFilter1; result.CustomFiltersObj.CustomFilters[0].Val = valFilter.valFilter1;
} }
if(valFilter.filter2 && valFilter.valFilter2 != null && valFilter.valFilter2 != undefined) if(valFilter.filter2 && valFilter.valFilter2 !== null)
{ {
if(result.CustomFiltersObj.CustomFilters[0]) if(result.CustomFiltersObj.CustomFilters[0])
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment