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