test/functional/member/messages_controller_test.rb @@ -1,12 +1,12 @@ class Member::MessagesController < Member::BaseController - + if Rails::VERSION::STRING >= '2.2' extend ActionView::Helpers::SanitizeHelper::ClassMethods include ActionView::Helpers::SanitizeHelper else include ActionView::Helpers::SanitizeHelper end - + def show @message = current_user.get_message(params[:id]) @message.read! @@ -15,17 +15,17 @@ class Member::MessagesController < Member::BaseController format.xml { render :xml => @message } end end - + def index @folder = (current_user.folders.find(params[:id]) unless params[:id].nil?) || current_user.inbox @messages = @folder.messages.paginate :page => params[:page] - + respond_to do |format| format.html format.rss { render :rss => @messages } end end - + def new @from = current_user @to = User.active.find(params[:user_id]) if params[:user_id] @@ -34,34 +34,41 @@ class Member::MessagesController < Member::BaseController format.xml { render :xml => @message } end end - + def create - to_user = User.active.find(params[:message][:to_user_id]) + begin + to_user = User.active.find(params[:message][:to_user_id]) + rescue ActiveRecord::RecordNotFound => e + error = I18n.t("tog_mail.member.user_not_found") + end + @message = Message.new( - :from => current_user, - :to => to_user, - :subject => sanitize(params[:message][:subject]), - :content => sanitize(params[:message][:content]) + :from => current_user, + :to => to_user, + :subject => sanitize(params[:message][:subject]), + :content => sanitize(params[:message][:content]) ) respond_to do |format| - if @message.dispatch! + if !to_user.blank? && @message.dispatch! flash[:ok] = I18n.t("tog_mail.member.message_sent") format.html { redirect_back_or_default(member_messages_path) } format.xml { render :xml => @message, :status => :created, :location => member_message_path(:id => @message) } else + flash[:error] = error + @from = current_user format.html { render :action => "new" } format.xml { render :xml => @message.errors, :status => :unprocessable_entity } end end end - + def destroy message = Message.find(params[:id]) folder_id = message.folder_id message.destroy redirect_to :action => 'index', :id => folder_id end - + def search @match ="%"+sanitize(params[:keyword])+"%" @msgs = Message.find_by_sql(["SELECT messages.id @@ -75,7 +82,7 @@ class Member::MessagesController < Member::BaseController page.replace_html 'search', :partial => 'search', :object => @fol_msgs end end - + def reply @reply_to = current_user.received_messages.find params[:id] respond_to do |format| @@ -83,9 +90,5 @@ class Member::MessagesController < Member::BaseController format.xml { render :xml => @message } end end - -end - - - +end \ No newline at end of file app/controllers/member/messages_controller.rb @@ -1,6 +1,6 @@ -Hi <%= @to_login %>, +<%= I18n.t('tog_mail.mailer.greeting')%> <%= @to_login %>, -You've been sent a Flickr Mail from <%= @from_login %>: +<%= I18n.t('tog_mail.mailer.message_received')%> '<%= @from_login %>': ------------------------------------------------------------ app/views/message_mailer/email_copy.html.erb @@ -9,8 +9,12 @@ en: from: From to: To when: When + mailer: + greeting: Hi + message_received: You've been sent the following Message from member: message_sent: Message was successfully delivered + user_not_found: You need to tell us who you want to send your message to. create_new_message: Create new message compose_new_message: Compose a new message no_messages: No messages locale/tog_mail.yml @@ -9,8 +9,12 @@ es: from: De to: Para when: Cuando + mailer: + greeting: Hola + message_received: Has recibido el siguiente mensaje de member: message_sent: El mensaje se ha enviado correctamente + user_not_found: Debes decirnos a quién le quieres enviar tu mensaje. create_new_message: Crear un nuevo mensaje compose_new_message: Escribir un nuevo mensaje no_messages: No hay mensajes locale/tog_mail_es.yml faed0bdf727d1042523543c83ddeff6b840bbb13 be3edde7f566f6f2283b288caadd95d6444668a6 Aitor García aitor.garcia@gmail.com http://github.com/tog/tog_mail/commit/599af97bb2e195ec8e1cb2542336aea0a2bae22a 599af97bb2e195ec8e1cb2542336aea0a2bae22a 2009-02-04T12:26:07-08:00 2009-02-04T12:26:07-08:00 Merge branch 'master' of git@github.com:tog/tog_mail 46a18dfdeade029b4b30239480700417afe16c99 Aitor García aitor.garcia@gmail.com