diff --git a/app/assets/javascripts/darkswarm/services/rails_flash_loader.js.coffee b/app/assets/javascripts/darkswarm/services/rails_flash_loader.js.coffee index 9398b5f5cc..4ef72122a7 100644 --- a/app/assets/javascripts/darkswarm/services/rails_flash_loader.js.coffee +++ b/app/assets/javascripts/darkswarm/services/rails_flash_loader.js.coffee @@ -1,7 +1,18 @@ Darkswarm.factory 'RailsFlashLoader', (flash, railsFlash)-> new class RailsFlashLoader + # The 'flash' service requires type key to + # be one of: success, info, warn, error + typePairings: + success: 'success' + error: 'error' + notice: 'success' + info: 'info' + warn: 'warn' + initFlash: -> @loadFlash railsFlash + loadFlash: (rails_flash)-> for type, message of rails_flash + type = @typePairings[type] flash[type] = message diff --git a/app/views/json/_flash.rabl b/app/views/json/_flash.rabl index 2900b2b948..5a90e00f02 100644 --- a/app/views/json/_flash.rabl +++ b/app/views/json/_flash.rabl @@ -1,2 +1,2 @@ object OpenStruct.new(flash.to_hash) -attributes :info, :success, :error +attributes :info, :success, :error, :notice