Fixed org logo detection in wizard.

This commit is contained in:
Martin Edenhofer 2015-08-04 20:57:11 +02:00
parent 3abc97df25
commit 847fa907c3
3 changed files with 18 additions and 0 deletions

View file

@ -287,6 +287,11 @@ class Base extends App.ControllerContent
@navigate '#import/' + data.import_backend @navigate '#import/' + data.import_backend
return return
# import config options
if data.config
for key, value of data.config
App.Config.set(key, value)
# render page # render page
@render() @render()
) )

View file

@ -977,8 +977,15 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password}
system_online_service: Setting.get('system_online_service'), system_online_service: Setting.get('system_online_service'),
addresses: addresses, addresses: addresses,
groups: groups, groups: groups,
config: config,
} }
true true
end end
def config
{
product_logo: Setting.get('product_logo')
}
end
end end

View file

@ -45,6 +45,7 @@ returns
preferences: { preferences: {
'Content-Type' => content_type 'Content-Type' => content_type
}, },
created_by_id: 1,
) )
filename(file) filename(file)
end end
@ -91,6 +92,7 @@ returns
preferences: { preferences: {
'Content-Type' => content_type 'Content-Type' => content_type
}, },
created_by_id: 1,
) )
StaticAssets.sync StaticAssets.sync
filename(file) filename(file)
@ -142,6 +144,10 @@ generate filename based on Store model
extention = '.jpg' extention = '.jpg'
elsif file.preferences['Content-Type'] =~ /png/i elsif file.preferences['Content-Type'] =~ /png/i
extention = '.png' extention = '.png'
elsif file.preferences['Content-Type'] =~ /gif/i
extention = '.gif'
elsif file.preferences['Content-Type'] =~ /svg/i
extention = '.svg'
end end
"#{hash}#{extention}" "#{hash}#{extention}"
end end