From: Tom Hughes <tom@compton.nu>
Date: Tue, 6 May 2008 16:35:24 +0000 (+0000)
Subject: Backout message deletion functionality as it has unfortunate side effects
X-Git-Tag: live~7745
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/895eb829c9647ba72fd49675bb0cbd82dda8bd5e?ds=sidebyside

Backout message deletion functionality as it has unfortunate side effects
as it also removes the message from the sender's outbox.
---

diff --git a/app/controllers/message_controller.rb b/app/controllers/message_controller.rb
index e79fe7461..85c0ac328 100644
--- a/app/controllers/message_controller.rb
+++ b/app/controllers/message_controller.rb
@@ -22,18 +22,6 @@ 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 ])
     @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}" 
diff --git a/app/views/message/_message_summary.rhtml b/app/views/message/_message_summary.rhtml
index dbd71f017..6d45d33dd 100644
--- a/app/views/message/_message_summary.rhtml
+++ b/app/views/message/_message_summary.rhtml
@@ -10,6 +10,4 @@
     <td><%= button_to 'Mark as read', :controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read' %></td>
   <% end %>
   <td><%= button_to 'Reply', :controller => 'message', :action => 'reply', :message_id => message_summary.id %></td>
-  <td><%= button_to 'Delete', :controller => 'message', :action => 'destroy', :message_id => message_summary.id %></td>
-
 </tr>
diff --git a/app/views/message/read.rhtml b/app/views/message/read.rhtml
index eccb26050..d44859029 100644
--- a/app/views/message/read.rhtml
+++ b/app/views/message/read.rhtml
@@ -32,7 +32,6 @@
   <tr>
     <td><%= button_to 'Reply', :controller => 'message', :action => 'reply', :message_id => @message.id %></td>
     <td><%= button_to 'Mark as unread', :controller => 'message', :action => 'mark', :message_id => @message.id, :mark => 'unread' %></td>
-    <td><%= button_to 'Delete', :controller => 'message', :action => 'destroy', :message_id => @message.id %></td>
     <td><%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
   </tr>
 </table>
diff --git a/config/routes.rb b/config/routes.rb
index 06f1583ff..dc26259fa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -144,7 +144,6 @@ ActionController::Routing::Routes.draw do |map|
   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'
-  map.connect '/message/delete/:message_id', :controller => 'message', :action => 'destroy'
 
   # fall through
   map.connect ':controller/:id/:action'