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

Improved now logo selection.

Browse source
This commit is contained in:
Martin Edenhofer 2014-11-19 23:45:37 +01:00
parent 8c62c7cb32
commit 9a40983bb1
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/getting_started_controller.rb
View file

@ -68,17 +68,11 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password}
end end
# validate image # validate image
if params[:logo] && !params[:logo].empty? if params[:logo] && params[:logo] =~ /^data:image/i
content_type = nil
content = nil
# data:image/png;base64 file = StaticAssets.data_url_attributes( params[:logo] )
if params[:logo] =~ /^data:(.+?);base64,(.+?)$/
content_type = $1
content = $2
end
if !content_type || !content if !file[:content] || !file[:content_type]
messages[:logo] = 'Unable to process image upload.' messages[:logo] = 'Unable to process image upload.'
end end
end end
@ -105,7 +99,7 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password}
settings[:organization] = params[:organization] settings[:organization] = params[:organization]
# save image # save image
if params[:logo] && !params[:logo].empty? if params[:logo] && params[:logo] =~ /^data:image/i
# data:image/png;base64 # data:image/png;base64
file = StaticAssets.data_url_attributes( params[:logo] ) file = StaticAssets.data_url_attributes( params[:logo] )
@ -114,7 +108,7 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password}
StaticAssets.store_raw( file[:content], file[:content_type] ) StaticAssets.store_raw( file[:content], file[:content_type] )
end end
if params[:logo_resize] && !params[:logo_resize].empty? if params[:logo_resize] && params[:logo_resize] =~ /^data:image/i
# data:image/png;base64 # data:image/png;base64
file = StaticAssets.data_url_attributes( params[:logo_resize] ) file = StaticAssets.data_url_attributes( params[:logo_resize] )

4
config/initializers/logo.rb
View file

@ -1,2 +1,4 @@
# sync logo to fs # sync logo to fs / only if settings already exists
if ActiveRecord::Base.connection.tables.include?('settings')
StaticAssets.sync StaticAssets.sync
end