fixed a small bug on Notification form

This commit is contained in:
Infineon\StieberD 2024-10-24 17:05:21 -07:00
parent 2a5abee93e
commit d4be43a478

View File

@ -288,44 +288,46 @@ Event PUB_ADD_GROUPS.CLICK()
GroupArray = Get_Property(@Window:'.EDT_AD_GROUPS', 'ARRAY') GroupArray = Get_Property(@Window:'.EDT_AD_GROUPS', 'ARRAY')
GroupIds = GroupArray<1> GroupIds = GroupArray<1>
SelGroups = Dialog_Box('NDW_ACTIVE_DIRECTORY_GROUPS', @Window, GroupIds) SelGroups = Dialog_Box('NDW_ACTIVE_DIRECTORY_GROUPS', @Window, GroupIds)
Set_Property(@Window:'.EDT_AD_GROUPS', 'LIST', SelGroups) If SelGroups NE '' then
Set_Property(@Window:'.EDT_AD_GROUPS', 'LIST', SelGroups)
Def = "" Def = ""
Def<MCOL$> = -2 Def<MCOL$> = -2
Def<MROW$> = -2 Def<MROW$> = -2
Def<MTEXT$> = "Updating LSL user list..." Def<MTEXT$> = "Updating LSL user list..."
Def<MTYPE$> = "U" Def<MTYPE$> = "U"
MsgUp = Msg(@window, Def) ;* display the processing message MsgUp = Msg(@window, Def) ;* display the processing message
GroupArray = Get_Property(@Window:'.EDT_AD_GROUPS', 'ARRAY') GroupArray = Get_Property(@Window:'.EDT_AD_GROUPS', 'ARRAY')
GroupIds = GroupArray<1> GroupIds = GroupArray<1>
If GroupIds NE '' then
LSLUserNames = '' LSLUserNames = ''
LSLNames = '' LSLNames = ''
For each GroupId in GroupIds using @VM If GroupIds NE '' then
MemberList = Active_Directory_Services('GetADGroupMembersByGroupName', GroupId, 'INFINEON') For each GroupId in GroupIds using @VM
MemberList = SRP_Array('Rotate', MemberList, @FM, @VM) MemberList = Active_Directory_Services('GetADGroupMembersByGroupName', GroupId, 'INFINEON')
ADUserNames = MemberList<1> MemberList = SRP_Array('Rotate', MemberList, @FM, @VM)
ADUserNames = MemberList<1>
Open 'DICT.LSL_USERS' to hDict then Open 'DICT.LSL_USERS' to hDict then
For each ADUserName in ADUserNames using @VM setting vPos For each ADUserName in ADUserNames using @VM setting vPos
Query = 'DOMAIN_USERNAME':@VM:ADUserName:@FM Query = 'DOMAIN_USERNAME':@VM:ADUserName:@FM
Flag = '' Flag = ''
LSLUsername = '' LSLUsername = ''
Btree.Extract(Query, 'LSL_USERS', hDict, LSLUsername, '', Flag) Btree.Extract(Query, 'LSL_USERS', hDict, LSLUsername, '', Flag)
If LSLUsername NE '' then LSLUsernames<0, -1> = LSLUsername<0, 1> If LSLUsername NE '' then LSLUsernames<0, -1> = LSLUsername<0, 1>
Next ADUserName Next ADUserName
end
Next GroupId
If LSLUsernames NE '' then
LSLNames = Xlate('LSL_USERS', LSLUserNames, 'FIRST_LAST', 'X')
end end
Next GroupId
If LSLUsernames NE '' then
LSLNames = Xlate('LSL_USERS', LSLUserNames, 'FIRST_LAST', 'X')
end end
end Array = LSLUsernames : @FM : LSLNames
Array = LSLUsernames : @FM : LSLNames Set_Property(@Window:'.EDT_LSL_USERS', 'ARRAY', Array)
Set_Property(@Window:'.EDT_LSL_USERS', 'ARRAY', Array)
Msg(@window, MsgUp) ;* take down the processing message Msg(@window, MsgUp) ;* take down the processing message
end
end event end event
@ -436,3 +438,4 @@ UnlockRec:
return return