Added support for ip based calendar setup.

This commit is contained in:
Martin Edenhofer 2015-09-28 02:11:44 +02:00
parent 455c23799d
commit 518d4c2632
2 changed files with 10 additions and 0 deletions

View file

@ -1,5 +1,8 @@
{ {
"Token": "secret_token", "Token": "secret_token",
"CalendarSetup": {
"Ip": "195.65.29.254"
},
"Users": [ "Users": [
{ {
"login": "hans.atila@zammad.org", "login": "hans.atila@zammad.org",

View file

@ -63,6 +63,13 @@ returns
UserInfo.current_user_id = admin_user.id UserInfo.current_user_id = admin_user.id
# set default calendar
if auto_wizard_hash['CalendarSetup']
if auto_wizard_hash['CalendarSetup']['Ip']
Calendar.init_setup(auto_wizard_hash['CalendarSetup']['Ip'])
end
end
# set Settings # set Settings
if auto_wizard_hash['Settings'] if auto_wizard_hash['Settings']
auto_wizard_hash['Settings'].each { |setting_data| auto_wizard_hash['Settings'].each { |setting_data|