From 5a961c8ee7e2e7d885c41ae35d0c865402a1eaa0 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 19 Jan 2017 17:26:26 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3blog=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E3=80=81blog=E5=9B=9E=E5=A4=8D500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/blog_comments_controller.rb | 3 +- app/controllers/users_controller.rb | 2 +- app/models/blog_message.rb | 4 +- app/views/users/_new_user_message.html.erb | 5 ++- app/views/users/_user_message_blog.html.erb | 42 +++++++++---------- .../20170119084215_rename_blog_message.rb | 8 ++++ db/schema.rb | 4 +- 7 files changed, 38 insertions(+), 30 deletions(-) create mode 100644 db/migrate/20170119084215_rename_blog_message.rb diff --git a/app/controllers/blog_comments_controller.rb b/app/controllers/blog_comments_controller.rb index 4aaa64566..b2dd971bb 100644 --- a/app/controllers/blog_comments_controller.rb +++ b/app/controllers/blog_comments_controller.rb @@ -177,8 +177,7 @@ class BlogCommentsController < ApplicationController reply_user_id = params[:reply_id].nil? ? @blogComment.blog.author_id: params[:reply_id].to_i # 回复的作业与评论的作者不是同一人则发送消息 if ( params[:reply_id].nil? && @blogComment.author.id != @blogComment.blog.author_id )|| (!params[:reply_id].nil? && @blogComment.author.id != params[:reply_id].to_i) - BlogMessage.create(:user_id => reply_user_id, :blog_id => params[:blog_id].to_i, :content => params[:blog_comment][:content], - :blog_commont_id => @blogComment.id, :blog_message_type => "BlogComment", :user_operator_id => @blogComment.author.id) + BlogMessage.create(:user_id => reply_user_id, :blog_id => params[:blog_id].to_i, :content => params[:blog_comment][:content],:blog_message_id => @blogComment.id, :blog_message_type => "BlogComment", :user_operator_id => @blogComment.author.id) end respond_to do |format| format.html { diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 96f159165..c7265c181 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -394,7 +394,7 @@ class UsersController < ApplicationController # 评论后,给回复人发消息(如果是本人就不发) if comment.author.id != BlogComment.find(comment.reply_id).author_id BlogMessage.create(:user_id => BlogComment.find(comment.reply_id).author_id, - :blog_commont_id => comment.id, + :blog_message_id => comment.id, :blog_id => comment.blog_id, :blog_message_type => "BlogComment", :content => comment.content, diff --git a/app/models/blog_message.rb b/app/models/blog_message.rb index 8a55addaf..103cdf94c 100644 --- a/app/models/blog_message.rb +++ b/app/models/blog_message.rb @@ -1,6 +1,6 @@ class BlogMessage < ActiveRecord::Base # attr_accessible :title, :body - attr_accessible :content, :blog_commont_id, :blog_message_type, :viewed, :user_id, :blog_id, :user_operator_id + attr_accessible :content, :blog_message_id, :blog_message_type, :viewed, :user_id, :blog_id, :user_operator_id belongs_to :blog_comment ,:polymorphic => true belongs_to :user @@ -8,7 +8,7 @@ class BlogMessage < ActiveRecord::Base validates :user_id, presence: true validates :blog_id, presence: true - validates :blog_commont_id, presence: true + validates :blog_message_id, presence: true validates :blog_message_type, presence: true after_create :add_user_message diff --git a/app/views/users/_new_user_message.html.erb b/app/views/users/_new_user_message.html.erb index 6456005e7..c321c316c 100644 --- a/app/views/users/_new_user_message.html.erb +++ b/app/views/users/_new_user_message.html.erb @@ -23,7 +23,10 @@ <% end %> <%# 博客消息 %> - <%= render :partial => 'users/user_message_blog', :locals => {:ma => ma} %> + <% if ma.class == BlogMessage %> + <%= render :partial => 'users/user_message_blog', :locals => {:ma => ma} %> + <% end %> + <% if ma.class == MemoMessage %> <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma} %> diff --git a/app/views/users/_user_message_blog.html.erb b/app/views/users/_user_message_blog.html.erb index 25534695b..a1a350019 100644 --- a/app/views/users/_user_message_blog.html.erb +++ b/app/views/users/_user_message_blog.html.erb @@ -1,22 +1,20 @@ -<% if ma.class == BlogMessage %> - <% if ma.blog_message_type == "BlogComment" %> - - <% end %> -<% end %> \ No newline at end of file +<% if ma.blog_message_type == "BlogComment" %> + +<% end %> diff --git a/db/migrate/20170119084215_rename_blog_message.rb b/db/migrate/20170119084215_rename_blog_message.rb new file mode 100644 index 000000000..7a44e846b --- /dev/null +++ b/db/migrate/20170119084215_rename_blog_message.rb @@ -0,0 +1,8 @@ +class RenameBlogMessage < ActiveRecord::Migration + def up + rename_column :blog_messages, :blog_commont_id, :blog_message_id + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 2498fb3af..5a73e61b9 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20170119072629) do +ActiveRecord::Schema.define(:version => 20170119084215) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -280,7 +280,7 @@ ActiveRecord::Schema.define(:version => 20170119072629) do create_table "blog_messages", :force => true do |t| t.integer "user_id" - t.integer "blog_commont_id" + t.integer "blog_message_id" t.integer "blog_id" t.string "blog_message_type" t.boolean "viewed", :default => false