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

messaging stuff and home location selection

Browse source
This commit is contained in:
Nick Black 2007-05-05 16:05:00 +00:00
parent 88a206b0f2
commit 20e02f42dc
6 changed files with 80 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/controllers/message_controller.rb
View file

@ -6,12 +6,14 @@ class MessageController < ApplicationController
def new
if params[:message]
to_user = User.find_by_display_name(params[:display_name])
body = params[:message][:body]
title = params[:message][:title]
message = Message.new
message.body = body
message.title = title
message.to_user_id = User.find_by_display_name(params[:display_name]).id
message.to_user_id = to_user.id
message.from_display_name = to_user.display_name
message.from_user_id = @user.id
message.sent_on = Time.now
if message.save
@ -22,4 +24,23 @@ class MessageController < ApplicationController
end
end
def read
if params[:message_id]
id = params[:message_id]
@message = Message.find_by_id(id)
end
end
def mark
if params[:message_id]
id = params[:message_id]
message = Message.find_by_id(id)
message.message_read = 1
if message.save
flash[:notice] = 'Message Marked as read'
redirect_to :controller => 'user', :action => 'view', :display_name => @user.display_name
end
end
end
end

4
app/models/user.rb
View file

@ -78,12 +78,12 @@ class User < ActiveRecord::Base
end
def get_new_messages
messages = Message.find(:all, :conditions => "message_read = 0")
messages = Message.find(:all, :conditions => "message_read = 0 and to_user_id = #{self.id}")
return messages
end
def get_all_messages
messages = Message.find(:all, :conditions => "message_read = 0")
messages = Message.find(:all, :conditions => "to_user_id = #{self.id}")
return messages
end

44
app/views/user/view.rhtml
View file

@ -1,26 +1,62 @@
<h2><%= @this_user.display_name %></h2>
<% if @user and @this_user.id == @user.id %>
<% if @user.has_messages? %>
<p>You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length - @user.get_new_messages.length %> old messages.</p>
<p>You have <%=@user.get_new_messages.length %> new messages and <%=@user.get_all_messages.length - @user.get_new_messages.length %> old messages:</p>
<div id = "messages">
<table class="messages">
<th>from<th>
<th>title<th>
<th>received on<th>
<th>mark as read<th>
<th>reply<th>
<th><th>
<% if params[:unread] %>
<% @user.get_all_messages.each do |message| %>
<tr><td><%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %></td>
<td><%= link_to message.title , :controller => 'message', :action => 'read', :message_id => message.id %></td>
<td><%= message.sent_on %></td>
<% if message.message_read = 0 %>
<td><%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %> </td>
<td><%= link_to 'reply', :controller => 'message', :action => 'new', :user_id => message.from_user_id %> </td>
<%else%>
<td>message read</td>
<%end%>
<%end%>
</tr>
<%else%>
<% @user.get_new_messages.each do |message| %>
<tr><td><%= link_to User.find(message.from_user_id).display_name , :controller => 'user', :action => User.find(message.from_user_id).display_name %></td>
<td><%= link_to message.title , :controller => 'message', :action => 'read', :message_id => message.id %></td>
<td><%= message.sent_on %></td>
<td><%= link_to 'reply', :controller => 'message', :action => 'new', :display_name => User.find(message.from_user_id).display_name %></td>
<% if message.message_read = 0 %>
<td><%= link_to 'mark as read', :controller => 'message', :action => 'mark', :message_id => message.id %> </td>
<%else%>
<td>message read</td>
<%end%>
</tr>
<%end%>
<%end%>
</table>
</div>
<%else%>
<p>You have no messages. </p>
<%end%>
<br />
<br />
<%= link_to 'show unread messages', :controller => 'user', :action => 'view', :display_name => @user.display_name, :unread => true %>
<br />
<br />
<%= link_to 'go to your account page', :controller => 'user', :action => 'account', :display_name => @user.display_name %><br /><br />
<% else %>
<%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => @this_user.display_name %><br /><br />
<%= link_to 'Add as friend', :controller => 'user', :action => 'make_friend', :display_name => @this_user.display_name %><br /><br />
@ -28,6 +64,8 @@
<%= link_to 'diary', :controller => 'user', :action => 'diary', :display_name => @this_user.display_name %><br /><br />
<p><%= params[:display_name] %> says: </p>
<%= simple_format(@this_user.description) %>

4
config/routes.rb
View file

@ -83,7 +83,9 @@ ActionController::Routing::Routes.draw do |map|
# messages
map.connect '/message/new/:display_name', :controller => 'message', :action => 'new'
map.connect '/message/new/:user_id', :controller => 'message', :action => 'new'
map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'
# fall through
map.connect ':controller/:id/:action'

3
db/migrate.sql
View file

@ -45,7 +45,8 @@ alter table users add column home_zoom int(2) default 3);
alter table users add column within_lon double default 2;
alter table users add column within_lat double default 2;
create table messages (id bigint not null auto_increment, user_id bigint(20) not null, from_user_id bigint(20) not null, title varchar(255), body text, sent_on datetime, message_read boolean default 0, primary key(id));
create table messages (id bigint not null auto_increment, user_id bigint(20) not null, from_user_id bigint(20) not null, from_display_name varchar(255) default "", title varchar(255), body text, sent_on datetime, message_read boolean default 0, primary key(id));
create index from_name_idx on messages(from_display_name);
create table friends (id bigint not null auto_increment, user_id bigint(20) not null, friend_user_id(20) not null, primary key(id));
create index user_id_idx on friends(friend_user_id);

5
public/stylesheets/site.css
View file

@ -124,6 +124,11 @@ body {
text-decoration: none;
}
#messages {
border: 1px solid #ccc;
}
#left_menu a:visited {
color: #000000;
text-decoration: none;