split_node_tags: Merge changes from main branch.

This commit is contained in:
Gabriel Ebner 2008-05-03 14:11:23 +00:00
commit 7eb181999d
58 changed files with 2021 additions and 739 deletions

View file

@ -20,6 +20,18 @@ class MessageController < ApplicationController
end
end
def destroy
@message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
if !@message.message_read
flash[:notice] = 'Message not read and so not deleted'
redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
else
flash[:notice] = "Message '#{@message.title}' deleted"
@message.destroy
redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
end
end
def reply
message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ])
title = message.title.sub(/^Re:\s*/, "Re: ")