From 98a86836d27cead19b4024427ee33beed66cdb48 Mon Sep 17 00:00:00 2001
From: Thomas Wood <grand.edgemaster@gmail.com>
Date: Fri, 19 Jun 2009 22:33:16 +0000
Subject: [PATCH] Commit avar's patch (+ fix for user not found) to change
 message sending URL to be by user name rather than id. (Closes #1920)

---
 app/controllers/message_controller.rb | 34 ++++++++++++++-------------
 app/views/message/new.html.erb        |  2 +-
 app/views/user/view.html.erb          |  2 +-
 config/routes.rb                      |  2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index b4cc6bfa8..2e5e09b45 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -10,27 +10,29 @@ class MessageController < ApplicationController
   # Allow the user to write a new message to another user. This action also 
   # deals with the sending of that message to the other user when the user
   # clicks send.
-  # The user_id param is the id of the user that the message is being sent to.
+  # The display_name param is the display name of the user that the message is being sent to.
   def new
     @title = t 'message.new.title'
-    @to_user = User.find(params[:user_id])
-    if params[:message]
-      @message = Message.new(params[:message])
-      @message.to_user_id = @to_user.id
-      @message.from_user_id = @user.id
-      @message.sent_on = Time.now.getutc
-   
-      if @message.save
-        flash[:notice] = t 'message.new.message_sent'
-        Notifier::deliver_message_notification(@message)
-        redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+    @to_user = User.find_by_display_name(params[:display_name])
+    if @to_user
+      if params[:message]
+        @message = Message.new(params[:message])
+        @message.to_user_id = @to_user.id
+        @message.from_user_id = @user.id
+        @message.sent_on = Time.now.getutc
+
+        if @message.save
+          flash[:notice] = t 'message.new.message_sent'
+          Notifier::deliver_message_notification(@message)
+          redirect_to :controller => 'message', :action => 'inbox', :display_name => @user.display_name
+        end
+      else
+        @title = params[:title]
       end
     else
-      @title = params[:title]
+      @title = t'message.no_such_user.title'
+      render :action => 'no_such_user', :status => :not_found
     end
-  rescue ActiveRecord::RecordNotFound
-    @title = t'message.no_such_user.title'
-    render :action => 'no_such_user', :status => :not_found
   end
 
   # Allow the user to reply to another message.
diff --git a/app/views/message/new.html.erb b/app/views/message/new.html.erb
index a356692c8..f771f619b 100644
--- a/app/views/message/new.html.erb
+++ b/app/views/message/new.html.erb
@@ -2,7 +2,7 @@
 
 <%= error_messages_for 'message' %>
 
-<% form_for :message, :url => { :action => "new", :user_id => @to_user.id } do |f| %>
+<% form_for :message, :url => { :action => "new", :display_name => @to_user.display_name } do |f| %>
   <table>
     <tr valign="top">
       <th><%= t'message.new.subject' %></th>
diff --git a/app/views/user/view.html.erb b/app/views/user/view.html.erb
index 36bba478c..5fdea140f 100644
--- a/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@ -9,7 +9,7 @@
 | <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
 <% else %>
 <!-- Displaying another user's profile page -->
-<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %>
+<%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
 | <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
 | <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %>
 | <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
diff --git a/config/routes.rb b/config/routes.rb
index 4b1161012..92bc493e1 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -175,7 +175,7 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox'
   map.connect '/user/:display_name/outbox', :controller => 'message', :action => 'outbox'
-  map.connect '/message/new/:user_id', :controller => 'message', :action => 'new'
+  map.connect '/message/new/:display_name', :controller => 'message', :action => 'new'
   map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
   map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
   map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
-- 
2.39.5