a flash implementation where flash_reset need not to be integrated in…

… the layout Signed-off-by: Balint Erdi <balint.erdi@gmail.com>
balinterdi · Feb 26, 2009 · 9308679 · 9308679
1 parent 285dea1
commit 9308679
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/my_helpers.rb b/my_helpers.rb
@@ -12,10 +12,10 @@ def self.included(base)
   module Flash
 
     def flash
-      if !session.key?("flash")
-        session["flash"] = Hash.new
+      if !@flash
+        @flash = (session["flash"] = Hash.new)
       end
-      session["flash"]
+      @flash
     end
 
     def reset_flash

diff --git a/the_pot.rb b/the_pot.rb
@@ -54,6 +54,10 @@ def current_user
 
 end
 
+before do
+  @flash = reset_flash
+end
+
 get '/main.css' do
   content_type 'text/css', :charset => 'utf-8'
   sass :main

diff --git a/views/layout.haml b/views/layout.haml
@@ -13,8 +13,7 @@
       - if flash[:ok]
         .ok= flash[:ok]
       - if flash[:error]
-        .ok= flash[:error]
+        .error= flash[:error]
     #container
       = yield
-      - reset_flash