Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2018-01-23 13:48:47 +01:00
commit 27265b0596
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/import/otrs/user.rb
View file

@ -96,6 +96,7 @@ module Import
queues.each do |queue| queues.each do |queue|
permissions = user['GroupIDs'][ queue['GroupID'] ] permissions = user['GroupIDs'][ queue['GroupID'] ]
permissions ||= user['GroupIDs'][ queue['GroupID'].to_s ]
next if !permissions next if !permissions
next if !permissions.include?('rw') next if !permissions.include?('rw')
@ -144,6 +145,7 @@ module Import
def groups_from_otrs_group(role_object, group) def groups_from_otrs_group(role_object, group)
result = [] result = []
return result if role_object.blank?
return result if role_object['GroupIDs'].blank? return result if role_object['GroupIDs'].blank?
permissions = role_object['GroupIDs'][ group['ID'] ] permissions = role_object['GroupIDs'][ group['ID'] ]
@ -165,7 +167,7 @@ module Import
roles = Import::OTRS::Requester.load('Role') roles = Import::OTRS::Requester.load('Role')
roles.each do |role| roles.each do |role|
next if !user['RoleIDs'].include?(role['ID']) next if !user['RoleIDs'].include?(role['ID'])
result += groups_from_otrs_groups(role['GroupIDs']) result += groups_from_otrs_groups(role)
end end
result result
end end