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

правка для функции CustomFilters -> isHideValue

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64285 954022d7-b5bf-4e40-9824-e11837661b57
parent 3e9a9c36
...@@ -4941,9 +4941,9 @@ CustomFilters.prototype.isHideValue = function(val){ ...@@ -4941,9 +4941,9 @@ CustomFilters.prototype.isHideValue = function(val){
var filterRes1 = this.CustomFilters[0] ? this.CustomFilters[0].isHideValue(val) : null; var filterRes1 = this.CustomFilters[0] ? this.CustomFilters[0].isHideValue(val) : null;
var filterRes2 = this.CustomFilters[1] ? this.CustomFilters[1].isHideValue(val) : null; var filterRes2 = this.CustomFilters[1] ? this.CustomFilters[1].isHideValue(val) : null;
if(this.And && ((filterRes1 === null && filterRes2 === true || filterRes1 === true && filterRes2 === null || filterRes1 === true && filterRes2 === true))) if(!this.And && ((filterRes1 === null && filterRes2 === true || filterRes1 === true && filterRes2 === null || filterRes1 === true && filterRes2 === true)))
res = true; res = true;
if(!this.And && ((filterRes1 === true || filterRes2 === true))) if(this.And && ((filterRes1 === true || filterRes2 === true)))
res = true; res = true;
return res; return res;
......
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