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

правка для пользовательского фильтра

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@58092 954022d7-b5bf-4e40-9824-e11837661b57
parent dc62baae
......@@ -4783,9 +4783,6 @@ var gUndoInsDelCellsFlag = true;
result.CustomFiltersObj.CustomFilters[1] = new CustomFilter();
result.CustomFiltersObj.CustomFilters[1].Operator = valFilter.filter2;
result.CustomFiltersObj.CustomFilters[1].Val = valFilter.valFilter2;
if(valFilter.isChecked == true)
result.CustomFiltersObj.And = true;
}
else
{
......@@ -4796,6 +4793,10 @@ var gUndoInsDelCellsFlag = true;
result.CustomFiltersObj.CustomFilters[0].Val = valFilter.valFilter2;
}
}
if(valFilter.isChecked == true && valFilter.filter2)
result.CustomFiltersObj.And = true;
return result;
},
......
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