Bug 1170021 - quota warning not displayed after cartridge add in the …

…web console
openshift · Dec 3, 2014 · a3637f2 · a3637f2
1 parent 160f134
commit a3637f2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/console/app/controllers/cartridges_controller.rb b/console/app/controllers/cartridges_controller.rb
@@ -26,10 +26,12 @@ def create
     if @cartridge.save
       @wizard = true
 
-      message = @cartridge.remote_results
-      flash[:info_pre] = message
+      # Only grab the warnings otherwise we end up with extra success / remote result messages not formatted how we want
+      messages = flash_messages(@cartridge.messages.select{ |m| m['severity'] == 'warning' }, {})
+      result = @cartridge.remote_results
+      messages[:info_pre] = result
 
-      redirect_to application_path(@application)
+      redirect_to application_path(@application), :flash => messages
     else
       Rails.logger.debug @cartridge.errors.inspect
       @application_id = @application.id