Added subject support to messages
This commit is contained in:
@@ -26,7 +26,11 @@ class MessagesController < ApplicationController
|
||||
redirect_to new_message_path
|
||||
return
|
||||
end
|
||||
if message_params[:text].blank?
|
||||
if message_params[:subject].blank?
|
||||
flash[:alert] = "Please write a subject before sending."
|
||||
redirect_to new_message_path
|
||||
return
|
||||
elsif message_params[:text].blank?
|
||||
flash[:alert] = "Please write a message before sending."
|
||||
redirect_to new_message_path
|
||||
return
|
||||
@@ -70,7 +74,7 @@ class MessagesController < ApplicationController
|
||||
params[:message][:user_target_id] = User.find_by(ign: params[:message][:user_target].strip).try(:id)
|
||||
params[:message][:user_sender_id] = User.find_by(ign: params[:message][:user_sender]).id
|
||||
|
||||
params.require(:message).permit([:text, :user_target_id, :user_sender_id])
|
||||
params.require(:message).permit([:subject, :text, :user_target_id, :user_sender_id])
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
@@ -5,9 +5,10 @@ class Message < ActiveRecord::Base
|
||||
belongs_to :user_sender, class_name: "User", foreign_key: "user_sender_id"
|
||||
belongs_to :user_target, class_name: "User", foreign_key: "user_target_id"
|
||||
|
||||
validates_presence_of :user_sender, :user_target, :text, on: :create
|
||||
validates_presence_of :user_sender, :user_target, :text, :subject
|
||||
|
||||
validates_length_of :text, in: 1..8000
|
||||
validates_length_of :subject, in: 1..2000
|
||||
|
||||
def sender
|
||||
@sender ||= if self.user_sender.present?
|
||||
|
||||
@@ -32,4 +32,4 @@
|
||||
<%= f.hidden_field :forum_id %>
|
||||
<p><%= f.submit "Create thread", class: "btn blue left" %></p>
|
||||
<div class="clear"></div>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
@@ -18,6 +18,10 @@
|
||||
<%= link_to(message.user_sender.avatar(64), message.user_sender, title: message.user_sender.ign) %>
|
||||
<%= render partial: "users/username", locals: { user: message.user_sender } %>
|
||||
<%= ago message.created_at %>
|
||||
<span style="font-size:18px">
|
||||
|
|
||||
<b><%= link_to message.subject, messages_path %></b>
|
||||
</span>
|
||||
<div class="right">
|
||||
<%= link_to "Delete message", message, :method => "delete", class: "editlink", data: {confirm: "Delete this message forever?"} %>
|
||||
</div>
|
||||
@@ -25,7 +29,7 @@
|
||||
</div>
|
||||
<div class="items">
|
||||
<div class="item">
|
||||
<%= render_md(message.text).html_safe %>
|
||||
<%= render_md(truncate message.text, length: 20, omission: "...").html_safe %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -9,7 +9,13 @@
|
||||
<br>
|
||||
<tr>
|
||||
<td>
|
||||
<%= render partial: "md_editor", locals: {name: "message[text]", content: params[:text]} %>
|
||||
<%= f.text_field :subject, placeholder: "Subject" %>
|
||||
</td>
|
||||
</tr>
|
||||
<br><br>
|
||||
<tr>
|
||||
<td>
|
||||
<%= render partial: "md_editor", locals: {name: "message[text]", content: params[:text]} %>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user