cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Backout message deletion functionality as it has unfortunate side effects

Browse source 
as it also removes the message from the sender's outbox.
This commit is contained in:
Tom Hughes 2008-05-06 16:35:24 +00:00
parent a47fcb0857
commit 895eb829c9
4 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/message_controller.rb
View file

@ -22,18 +22,6 @@ class MessageController < ApplicationController
end end
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 def reply
message = Message.find(params[:message_id], :conditions => ["to_user_id = ? or from_user_id = ?", @user.id, @user.id ]) 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(/^/, '> ')}" @body = "On #{message.sent_on} #{message.sender.display_name} wrote:\n\n#{message.body.gsub(/^/, '> ')}"

2
app/views/message/_message_summary.rhtml
View file

@ -10,6 +10,4 @@
<td><%= button_to 'Mark as read', :controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read' %></td> <td><%= button_to 'Mark as read', :controller => 'message', :action => 'mark', :message_id => message_summary.id, :mark => 'read' %></td>
<% end %> <% end %>
<td><%= button_to 'Reply', :controller => 'message', :action => 'reply', :message_id => message_summary.id %></td> <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> </tr>

1
app/views/message/read.rhtml
View file

@ -32,7 +32,6 @@
<tr> <tr>
<td><%= button_to 'Reply', :controller => 'message', :action => 'reply', :message_id => @message.id %></td> <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 '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> <td><%= link_to 'Back to inbox', :controller => 'message', :action => 'inbox', :display_name => @user.display_name %></td>
</tr> </tr>
</table> </table>

1
config/routes.rb
View file

@ -144,7 +144,6 @@ ActionController::Routing::Routes.draw do |map|
map.connect '/message/read/:message_id', :controller => 'message', :action => 'read' map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark' map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply' map.connect '/message/reply/:message_id', :controller => 'message', :action => 'reply'
map.connect '/message/delete/:message_id', :controller => 'message', :action => 'destroy'
# fall through # fall through
map.connect ':controller/:id/:action' map.connect ':controller/:id/:action'