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

Added support to add initial org to initial user.

Browse source
This commit is contained in:
Martin Edenhofer 2015-05-23 01:54:33 +02:00
parent 82dc983f49
commit 47d2aa5a34
3 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
contrib/auto_wizard_example.json
View file

@ -5,6 +5,7 @@
"firstname": "Hans", "firstname": "Hans",
"lastname": "Atila", "lastname": "Atila",
"email": "hans.atila@zammad.org", "email": "hans.atila@zammad.org",
"organization": "Demo Organization",
"password": "Z4mm4dr0ckZ!" "password": "Z4mm4dr0ckZ!"
} }
], ],
@ -28,7 +29,7 @@
"email": "zammad_demo@localhost" "email": "zammad_demo@localhost"
} }
], ],
"Organization": [ "Organizations": [
{ {
"name": "Demo Organization" "name": "Demo Organization"
} }

28
lib/auto_wizard.rb
View file

@ -21,12 +21,11 @@ returns
def self.setup def self.setup
auto_wizard_file_name = 'auto_wizard.json' auto_wizard_file_name = 'auto_wizard.json'
auto_wizard_file_name = "#{Rails.root}/#{auto_wizard_file_name}" auto_wizard_file_location = "#{Rails.root}/#{auto_wizard_file_name}"
return if !File.file?(auto_wizard_file_name) return if !File.file?(auto_wizard_file_location)
auto_wizard_file = File.read(auto_wizard_file_name)
auto_wizard_file = File.read(auto_wizard_file_location)
auto_wizard_hash = JSON.parse(auto_wizard_file) auto_wizard_hash = JSON.parse(auto_wizard_file)
admin_user = User.find( 1 ) admin_user = User.find( 1 )
@ -40,12 +39,9 @@ returns
# create Organizations # create Organizations
if auto_wizard_hash['Organizations'] if auto_wizard_hash['Organizations']
auto_wizard_hash['Organizations'].each { |organization_data| auto_wizard_hash['Organizations'].each { |organization_data|
organization_data_symbolized = organization_data.symbolize_keys organization_data_symbolized = organization_data.symbolize_keys.merge(
organization_data_symbolized = organization_data_symbolized.merge(
{ {
updated_by_id: admin_user.id, updated_by_id: admin_user.id,
created_by_id: admin_user.id created_by_id: admin_user.id
@ -66,9 +62,16 @@ returns
auto_wizard_hash['Users'].each { |user_data| auto_wizard_hash['Users'].each { |user_data|
user_data_symbolized = user_data.symbolize_keys # lookup organization
if user_data['organization']
organization = Organization.find_by(name: user_data['organization'])
user_data.delete('organization')
if organization
user_data['organization_id'] = organization.id
end
end
user_data_symbolized = user_data_symbolized.merge( user_data_symbolized = user_data.symbolize_keys.merge(
{ {
active: true, active: true,
roles: roles, roles: roles,
@ -91,12 +94,9 @@ returns
# create EmailAddresses # create EmailAddresses
if auto_wizard_hash['EmailAddresses'] if auto_wizard_hash['EmailAddresses']
auto_wizard_hash['EmailAddresses'].each { |email_address_data| auto_wizard_hash['EmailAddresses'].each { |email_address_data|
email_address_data_symbolized = email_address_data.symbolize_keys email_address_data_symbolized = email_address_data.symbolize_keys.merge(
email_address_data_symbolized = email_address_data_symbolized.merge(
{ {
updated_by_id: admin_user.id, updated_by_id: admin_user.id,
created_by_id: admin_user.id created_by_id: admin_user.id

12
test/integration/auto_wizard_test.rb
View file

@ -21,6 +21,18 @@ class AutoWizardTest < TestCase
timeout: 20, timeout: 20,
) )
organization_open_by_search(
value: 'Demo Organization',
)
watch_for(
css: '.active .profile-window',
value: 'Demo Organization',
)
watch_for(
css: '.active .profile-window',
value: 'Atila',
)
end end
end end