mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-08-15 10:47:21 +00:00
#SET_GROUP small enhancement for prefix filter
This commit is contained in:
parent
e74c79b5d6
commit
80df849d18
@ -2003,12 +2003,13 @@ do
|
|||||||
if self.Filter.Categories and MGroupInclude then
|
if self.Filter.Categories and MGroupInclude then
|
||||||
local MGroupCategory = false
|
local MGroupCategory = false
|
||||||
for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
|
for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
|
||||||
--self:T3( { "Category:", MGroup:GetCategory(), self.FilterMeta.Categories[CategoryName], CategoryName } )
|
--self:I( { "Category:", MGroup:GetCategory(), self.FilterMeta.Categories[CategoryName], CategoryName } )
|
||||||
if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == MGroup:GetCategory() then
|
if self.FilterMeta.Categories[CategoryName] and self.FilterMeta.Categories[CategoryName] == MGroup:GetCategory() then
|
||||||
MGroupCategory = true
|
MGroupCategory = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
MGroupInclude = MGroupInclude and MGroupCategory
|
MGroupInclude = MGroupInclude and MGroupCategory
|
||||||
|
--self:I("Is Included: "..tostring(MGroupInclude))
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.Filter.Countries and MGroupInclude then
|
if self.Filter.Countries and MGroupInclude then
|
||||||
@ -2025,12 +2026,13 @@ do
|
|||||||
if self.Filter.GroupPrefixes and MGroupInclude then
|
if self.Filter.GroupPrefixes and MGroupInclude then
|
||||||
local MGroupPrefix = false
|
local MGroupPrefix = false
|
||||||
for GroupPrefixId, GroupPrefix in pairs( self.Filter.GroupPrefixes ) do
|
for GroupPrefixId, GroupPrefix in pairs( self.Filter.GroupPrefixes ) do
|
||||||
--self:T3( { "Prefix:", string.find( MGroup:GetName(), GroupPrefix, 1 ), GroupPrefix } )
|
--self:I( { "Prefix:", MGroup:GetName(), GroupPrefix } )
|
||||||
if string.find( MGroup:GetName(), GroupPrefix:gsub( "-", "%%-" ), 1 ) then
|
if string.find( string.lower(MGroup:GetName()), string.lower(GroupPrefix), 1 ) or string.find( string.lower(MGroup:GetName()), string.lower(GroupPrefix), 1, true ) then
|
||||||
MGroupPrefix = true
|
MGroupPrefix = true
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
MGroupInclude = MGroupInclude and MGroupPrefix
|
MGroupInclude = MGroupInclude and MGroupPrefix
|
||||||
|
--self:I("Is Included: "..tostring(MGroupInclude))
|
||||||
end
|
end
|
||||||
|
|
||||||
if self.Filter.Zones and MGroupInclude then
|
if self.Filter.Zones and MGroupInclude then
|
||||||
@ -2050,7 +2052,7 @@ do
|
|||||||
MGroupInclude = MGroupInclude and MGroupFunc
|
MGroupInclude = MGroupInclude and MGroupFunc
|
||||||
end
|
end
|
||||||
|
|
||||||
--self:T2( MGroupInclude )
|
--self:I( MGroupInclude )
|
||||||
return MGroupInclude
|
return MGroupInclude
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -9008,5 +9010,4 @@ do -- SET_DYNAMICCARGO
|
|||||||
return owners
|
return owners
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user