# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2014-09-23 03:52:34
# Node ID 6b25a7ebe31240527f9a64aa08a07a461854a88e
# Parent  9bd14bb6e95dbb38de71654095b60a5facb1faad
# Parent  12f37667f516bc2a7fd73c7927591ee33b46a5e4

Merge pull request #1 from jittat/master

Pull all-message from jittat master

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -6,7 +6,7 @@
          :redirect_to => { :action => 'list' }
 
   before_filter :admin_authorization, :only => ['console','show',
-                                                'reply','hide']
+                                                'reply','hide','list_all']
 
   def list
     @user = User.find(session[:user_id])
@@ -22,6 +22,11 @@
     @message = Message.find(params[:id])
   end
 
+  def list_all
+    @user = User.find(session[:user_id])
+    @messages = Message.where(receiver_id: nil).order(:created_at)
+  end
+
   def create
     user = User.find(session[:user_id])
     @message = Message.new(params[:message])
diff --git a/app/views/messages/_short_message.html.haml b/app/views/messages/_short_message.html.haml
--- a/app/views/messages/_short_message.html.haml
+++ b/app/views/messages/_short_message.html.haml
@@ -8,4 +8,5 @@
   %td
     - if short_message.sender
       = link_to "[reply]", :action => 'show', :id => short_message.id
-    = link_to "[hide]", :action => 'hide', :id => short_message.id
+    - if params[:action] != 'list_all'
+      = link_to "[hide]", :action => 'hide', :id => short_message.id
diff --git a/app/views/messages/list_all.html.haml b/app/views/messages/list_all.html.haml
new file mode 100644
--- /dev/null
+++ b/app/views/messages/list_all.html.haml
@@ -0,0 +1,13 @@
+= user_title_bar(@user)
+
+%h1 Console: all messages
+
+= link_to '[active messages]', :action => 'list_all'
+
+%table
+  %tr
+    %th From
+    %th When
+    %th Message
+    %th
+  = render :partial => "short_message", :collection => @messages