From 5ee53b824d25d1ef6464fc379688656b642de3be Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 31 Aug 2015 16:01:31 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=B5=84=E6=BA=90=E6=B7=BB=E5=8A=A0=E8=87=B3=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/attachment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/attachment.rb b/app/models/attachment.rb index f7fb9b1aa..47ab30cb1 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -73,7 +73,7 @@ class Attachment < ActiveRecord::Base cattr_accessor :thumbnails_storage_path @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") - before_save :files_to_final_location,:act_as_course_activity + before_save :files_to_final_location,:act_as_course_activity,:act_as_forge_activity after_create :office_conver, :be_user_score,:act_as_forge_activity after_update :office_conver, :be_user_score after_destroy :delete_from_disk,:down_user_score From b5c0d0359051a36032aeee644c2a5d902e87e21c Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 31 Aug 2015 16:41:52 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=81=E7=A7=BB=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message.rb | 32 ++++++++--------- app/views/users/user_messages.html.erb | 4 +-- .../20150831030041_user_feedback_message.rb | 36 +++++++++++++++++++ .../20150831070611_about_memo_message.rb | 36 +++++++++++++++++++ 4 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 db/migrate/20150831030041_user_feedback_message.rb create mode 100644 db/migrate/20150831070611_about_memo_message.rb diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 6f775e7a2..c44b1aeee 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -202,24 +202,24 @@ class JournalsForMessage < ActiveRecord::Base # 用户留言消息通知 def act_as_user_feedback_message # 主留言 - receivers = [] - if self.reply_id == 0 - if self.user_id != self.jour_id # 过滤自己给自己的留言消息 - receivers << self.jour - end - else # 留言回复 - reply_to = User.find(self.reply_id) - if self.user_id != self.reply_id # 添加我回复的那个人 - receivers << reply_to - end - if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发 - receivers << self.parent.jour - end - end if self.jour_type == 'Principal' - receivers.each do |r| - self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false) + receivers = [] + if self.reply_id == 0 + if self.user_id != self.jour_id # 过滤自己给自己的留言消息 + receivers << self.jour end + else # 留言回复 + reply_to = User.find(self.reply_id) + if self.user_id != self.reply_id # 添加我回复的那个人 + receivers << reply_to + end + if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发 + receivers << self.parent.jour + end + end + receivers.each do |r| + self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false) + end end end diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 207572a1c..1fde154bd 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -20,9 +20,9 @@ <%# 项目相关消息 %> - +
  • <%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey" %>
    • <%# 系统贴吧 %> - +
  • <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %>
    • diff --git a/db/migrate/20150831030041_user_feedback_message.rb b/db/migrate/20150831030041_user_feedback_message.rb new file mode 100644 index 000000000..24723fc0a --- /dev/null +++ b/db/migrate/20150831030041_user_feedback_message.rb @@ -0,0 +1,36 @@ +# encoding: UTF-8 +class UserFeedbackMessage < ActiveRecord::Migration + def up + JournalsForMessage.all.each do |jour_for_message| + transaction do + # 主留言 + if jour_for_message.jour_type == 'Principal' + receivers = [] + if jour_for_message.reply_id == 0 + if jour_for_message.user_id != jour_for_message.jour_id # 过滤自己给自己的留言消息 + receivers << jour_for_message.jour + end + else # 留言回复 + reply_to = User.find(jour_for_message.reply_id) + if jour_for_message.user_id != jour_for_message.reply_id # 添加我回复的那个人 + receivers << reply_to + end + unless jour_for_message.parent.nil? + if jour_for_message.user_id != jour_for_message.parent.jour_id && jour_for_message.reply_id != jour_for_message.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发 + receivers << jour_for_message.parent.jour + end + end + end + unless receivers.blank? + receivers.each do |r| + jour_for_message.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => jour_for_message.id, :journals_for_message_type => "Principal", :viewed => false) + end + end + end + end + end + end + + def down + end +end diff --git a/db/migrate/20150831070611_about_memo_message.rb b/db/migrate/20150831070611_about_memo_message.rb new file mode 100644 index 000000000..26551d4a1 --- /dev/null +++ b/db/migrate/20150831070611_about_memo_message.rb @@ -0,0 +1,36 @@ +class AboutMemoMessage < ActiveRecord::Migration + def up + Memo.all.each do |memo| + transaction do + # 贴吧帖子 + receivers = [] + u = User.find(6) + receivers << u + # 主贴 + if memo.parent_id.nil? + if memo.author_id != memo.forum.creator_id # 发帖人不是吧主 + receivers << memo.forum.creator + end + else # 回帖 + # 添加吧主 + if memo.author_id != memo.forum.creator_id + receivers << memo.forum.creator + end + # 添加发帖人 + unless memo.parent.nil? + if memo.author_id != memo.parent.author_id + receivers << memo.parent.author + puts memo.id + end + end + end + receivers.each do |r| + memo.memo_messages << MemoMessage.new(:user_id => r.id, :forum_id => memo.forum_id, :memo_id => memo.id, :memo_type => "Memo", :viewed => false) + end + end + end + end + + def down + end +end From 311634abf1ad98a9038787b253fbdec35eadcf52 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 31 Aug 2015 16:53:54 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index f28e6442b..e6b19fb6c 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -930,7 +930,7 @@ img.ui-datepicker-trigger { margin: 7px; } /*消息*/ -.homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;} +.homepageNewsTypeNotRead {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;} .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;} .calendar_div{border: 1px solid #d9d9d9;} /*缺陷更新动态在消息中显示样式*/ From 6dff29f93155acc4dc6994318c96f0387525f82e Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 31 Aug 2015 17:45:14 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20150831085920_update_memo_time.rb | 26 +++++++++++++++++++ ...20150831090338_update_userfeedback_time.rb | 26 +++++++++++++++++++ ...0831093918_about_user_feedback_message.rb} | 4 +-- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20150831085920_update_memo_time.rb create mode 100644 db/migrate/20150831090338_update_userfeedback_time.rb rename db/migrate/{20150831030041_user_feedback_message.rb => 20150831093918_about_user_feedback_message.rb} (93%) diff --git a/db/migrate/20150831085920_update_memo_time.rb b/db/migrate/20150831085920_update_memo_time.rb new file mode 100644 index 000000000..c2ecd0144 --- /dev/null +++ b/db/migrate/20150831085920_update_memo_time.rb @@ -0,0 +1,26 @@ +class UpdateMemoTime < ActiveRecord::Migration + def up + memo_count = Memo.all.count / 30 + 1 + transaction do + for i in 1 ... memo_count do i + MemoMessage.page(i).per(30).each do |memo_message| + if memo_message.memo + if memo_message.memo.respond_to?("created_at") + memo_message.created_at = memo_message.memo.created_at + elsif memo_message.memo.respond_to?("created_on") + memo_message.created_at = memo_message.memo.created_on + end + memo_message.save + + memo_messages = MemoMessage.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first + memo_messages.created_at = memo_message.created_at + memo_messages.save + end + end + end + end + end + + def down + end +end diff --git a/db/migrate/20150831090338_update_userfeedback_time.rb b/db/migrate/20150831090338_update_userfeedback_time.rb new file mode 100644 index 000000000..860a4881a --- /dev/null +++ b/db/migrate/20150831090338_update_userfeedback_time.rb @@ -0,0 +1,26 @@ +class UpdateUserfeedbackTime < ActiveRecord::Migration + def up + user_feedback_count = UserFeedbackMessage.all.count / 30 + 1 + transaction do + for i in 1 ... user_feedback_count do i + UserFeedbackMessage.page(i).per(30).each do |ufm| + if ufm.course_message + if ufm.course_message.respond_to?("created_at") + ufm.created_at = ufm.course_message.created_at + elsif ufm.course_message.respond_to?("created_on") + ufm.created_at = ufm.course_message.created_on + end + ufm.save + + user_feedbach_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first + user_feedbach_messages.created_at = ufm.created_at + user_feedbach_messages.save + end + end + end + end + end + + def down + end +end diff --git a/db/migrate/20150831030041_user_feedback_message.rb b/db/migrate/20150831093918_about_user_feedback_message.rb similarity index 93% rename from db/migrate/20150831030041_user_feedback_message.rb rename to db/migrate/20150831093918_about_user_feedback_message.rb index 24723fc0a..870795966 100644 --- a/db/migrate/20150831030041_user_feedback_message.rb +++ b/db/migrate/20150831093918_about_user_feedback_message.rb @@ -1,5 +1,4 @@ -# encoding: UTF-8 -class UserFeedbackMessage < ActiveRecord::Migration +class AboutUserFeedbackMessage < ActiveRecord::Migration def up JournalsForMessage.all.each do |jour_for_message| transaction do @@ -23,6 +22,7 @@ class UserFeedbackMessage < ActiveRecord::Migration end unless receivers.blank? receivers.each do |r| + puts jour_for_message.id jour_for_message.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => jour_for_message.id, :journals_for_message_type => "Principal", :viewed => false) end end From 8403d5365c39a958a674f28a489ac0d88b63bc2b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 31 Aug 2015 17:49:48 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/project.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/javascripts/project.js b/public/javascripts/project.js index c7a615ba3..a09484fd5 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -248,6 +248,13 @@ function regexDescription() { $("#description_notice_span").focus(); return false; } + else if (name.length > 10000) + { + $("#description_notice_span").text("描述超过10000个字符"); + $("#description_notice_span").css('color', '#ff0000'); + $("#description_notice_span").focus(); + return false; + } else { $("#description_notice_span").text("填写正确"); $("#description_notice_span").css('color', '#008000'); From 284d33b096bdd9df069580ee349eed34cd72677b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:18:30 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E?= =?UTF-8?q?=E5=B8=96=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=E5=9B=9E=E5=B8=96?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 1fde154bd..7c37ef9a0 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -83,7 +83,7 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
  • - <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, + <%=link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • From 86ced0e290f8c56358477b910759942b71aae904 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:40:04 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E?= =?UTF-8?q?=E5=B8=96=E6=B6=88=E6=81=AF=E5=BA=94=E8=AF=A5=E5=9C=A8RE:?= =?UTF-8?q?=E5=90=8E=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=9B=9E=E5=B8=96=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 7c37ef9a0..9f289e3d5 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -83,8 +83,9 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
  • - <%=link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, - :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", + <%= link_to ma.course_message.parent_id.nil? ? ma.course_message.subject.html_safe : ma.course_message.content.html_safe, + course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -152,7 +153,7 @@
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %>
  • - <%=link_to ma.forge_message.subject.html_safe, project_boards_path(ma.forge_message.project, + <%=link_to ma.forge_message.parent_id.nil? ? ma.forge_message.subject.html_safe : ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project, :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.forge_message.subject.html_safe}" %>
    • From fd0e4a7afd757c0e84b7a42792e3fd5a79edc41b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:56:59 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AEwiki=EF=BC=9A=E8=BE=93?= =?UTF-8?q?=E5=85=A5wiki=E4=B8=BA=E9=9D=9E=E6=B1=89=E5=AD=97=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=94=E9=95=BF=E5=BA=A6=E5=A4=9F=E9=95=BF=EF=BC=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 8d86a6873..a22831b2c 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -507,7 +507,7 @@ img.ui-datepicker-trigger { .wiki_new_ul input{ height:26px; margin-bottom:10px;} .wiki_con_tit{ font-size:14px; color:#09658c; font-weight:bold;width:630px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; margin-bottom:10px;} .wiki_con_box{ line-height:1.9; color:#2d2d2d;} -.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;} +.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px; word-wrap:break-word; word-break:break-all} .wiki_page p{word-break: break-all;word-wrap: break-word;} #wiki_new_box{ display:none;} /*wiki显示附加*/ From fede611fea4687a685707db5d75852ba1a0e4d29 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 1 Sep 2015 15:23:30 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=BB=8F=E8=BF=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E6=95=88=E6=9E=9C=20?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=E6=95=B0=E6=8D=AE=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user_feedback_message.rb | 2 +- app/views/users/user_messages.html.erb | 24 +++++++++++++++-- ...20150831090338_update_userfeedback_time.rb | 26 ------------------ ...0150901004812_update_memo_message_time.rb} | 4 +-- ...1004910_update_userfeeback_message_time.rb | 27 +++++++++++++++++++ public/stylesheets/new_user.css | 2 -- 6 files changed, 52 insertions(+), 33 deletions(-) delete mode 100644 db/migrate/20150831090338_update_userfeedback_time.rb rename db/migrate/{20150831085920_update_memo_time.rb => 20150901004812_update_memo_message_time.rb} (77%) create mode 100644 db/migrate/20150901004910_update_userfeeback_message_time.rb diff --git a/app/models/user_feedback_message.rb b/app/models/user_feedback_message.rb index 1dda157d6..02335b8e2 100644 --- a/app/models/user_feedback_message.rb +++ b/app/models/user_feedback_message.rb @@ -8,7 +8,7 @@ class UserFeedbackMessage < ActiveRecord::Base validates :user_id,presence: true validates :journals_for_message_id,presence: true validates :journals_for_message_type, presence: true - after_create :add_user_message + after_save :add_user_message def add_user_message self.message_alls << MessageAll.new(:user_id => self.user_id) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 1fde154bd..f9b96d7cc 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -198,7 +198,7 @@ " ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %>
  • - <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %> + <%= link_to ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content}" %>
  • <%= time_tag(ma.memo.created_at).html_safe %>
    • @@ -215,8 +215,13 @@ <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %> +
  • - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}" %> + + <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", + :title => "#{ma.journals_for_message.notes}", + :onmouseover =>"message_titile_show('message_title')", + :onmouseout => "message_titile_hide('message_title')" %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • @@ -237,6 +242,21 @@ + + + + diff --git a/db/migrate/20150831090338_update_userfeedback_time.rb b/db/migrate/20150831090338_update_userfeedback_time.rb deleted file mode 100644 index 860a4881a..000000000 --- a/db/migrate/20150831090338_update_userfeedback_time.rb +++ /dev/null @@ -1,26 +0,0 @@ -class UpdateUserfeedbackTime < ActiveRecord::Migration - def up - user_feedback_count = UserFeedbackMessage.all.count / 30 + 1 - transaction do - for i in 1 ... user_feedback_count do i - UserFeedbackMessage.page(i).per(30).each do |ufm| - if ufm.course_message - if ufm.course_message.respond_to?("created_at") - ufm.created_at = ufm.course_message.created_at - elsif ufm.course_message.respond_to?("created_on") - ufm.created_at = ufm.course_message.created_on - end - ufm.save - - user_feedbach_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first - user_feedbach_messages.created_at = ufm.created_at - user_feedbach_messages.save - end - end - end - end - end - - def down - end -end diff --git a/db/migrate/20150831085920_update_memo_time.rb b/db/migrate/20150901004812_update_memo_message_time.rb similarity index 77% rename from db/migrate/20150831085920_update_memo_time.rb rename to db/migrate/20150901004812_update_memo_message_time.rb index c2ecd0144..e512282a0 100644 --- a/db/migrate/20150831085920_update_memo_time.rb +++ b/db/migrate/20150901004812_update_memo_message_time.rb @@ -1,4 +1,4 @@ -class UpdateMemoTime < ActiveRecord::Migration +class UpdateMemoMessageTime < ActiveRecord::Migration def up memo_count = Memo.all.count / 30 + 1 transaction do @@ -12,7 +12,7 @@ class UpdateMemoTime < ActiveRecord::Migration end memo_message.save - memo_messages = MemoMessage.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first + memo_messages = MessageAll.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first memo_messages.created_at = memo_message.created_at memo_messages.save end diff --git a/db/migrate/20150901004910_update_userfeeback_message_time.rb b/db/migrate/20150901004910_update_userfeeback_message_time.rb new file mode 100644 index 000000000..686bc496e --- /dev/null +++ b/db/migrate/20150901004910_update_userfeeback_message_time.rb @@ -0,0 +1,27 @@ +class UpdateUserfeebackMessageTime < ActiveRecord::Migration + def up + user_feedback_count = UserFeedbackMessage.all.count / 30 + 1 + transaction do + for i in 1 ... user_feedback_count do i + UserFeedbackMessage.page(i).per(30).each do |ufm| + if ufm.journals_for_message + if ufm.journals_for_message.respond_to?("created_at") + ufm.created_at = ufm.journals_for_message.created_at + elsif ufm.journals_for_message.respond_to?("created_on") + ufm.created_at = ufm.journals_for_message.created_on + end + puts ufm.id + ufm.save + + user_feedback_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first + user_feedback_messages.created_at = ufm.created_at + user_feedback_messages.save + end + end + end + end + end + + def down + end +end diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e6b19fb6c..4229b5531 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -963,5 +963,3 @@ img.ui-datepicker-trigger { - - From 7361f40b0cac3c6eff5f8bc4252d71bebb87f1b1 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 1 Sep 2015 16:12:37 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=94=99=E8=AF=AF=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7b83bb1c2..496565c23 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -756,15 +756,16 @@ module ApplicationHelper return ss end - def time_tag(time, *args) - options = args.extract_options! - text = distance_of_time_in_words(Time.now, time) - if @project - link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time))) - else - content_tag('acronym', text, options.reverse_merge(:title => format_time(time))) - end - end + # def time_tag(time, *args) + # options = args.extract_options! + # text = distance_of_time_in_words(Time.now, time) + # if @project + # content_tag('acronym', text, options.reverse_merge(:title => format_time(time))) + # # link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time))) + # else + # content_tag('acronym', text, options.reverse_merge(:title => format_time(time))) + # end + # end def syntax_highlight_lines(name, content) lines = [] From e89fbd2c8e410b2e4e2ac7e2091d8d967324b466 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 1 Sep 2015 17:37:43 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=90=8C=E7=A7=8D=E7=B1=BB=E5=9E=8B=E8=BF=87?= =?UTF-8?q?=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 57 ++++++++++++-------------- app/views/users/user_messages.html.erb | 8 ++-- 2 files changed, 31 insertions(+), 34 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0058e6e4c..101fadcd8 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -126,46 +126,41 @@ class UsersController < ApplicationController end when 'homework' @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "HomeworkCommon", @user).order("created_at desc") - @message_alls_count = @message_alls.count when 'course_message' @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Message", @user).order("created_at desc") - @message_alls_count = @message_alls.count - when 'forge_message' - @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc") - @message_alls_count = @message_alls.count + # when 'forge_message' + # @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Message", @user).order("created_at desc") + # @message_alls_count = @message_alls.count when 'course_news' - @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "News", @user).order("created_at desc") - @message_alls_count = @message_alls.count + # 课程通知包含发布的通知和回复的通知 + @message_alls = CourseMessage.where("course_message_type =? or course_message_type =?", "News", "Comment").where("user_id =?", @user).order("created_at desc") #@user_course_messages_count = @user_course_messages.count - when 'forge_news' - @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc") - @message_alls_count = @message_alls.count - when 'course_news_reply' - @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc") - when 'forge_news_reply' - @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc") - @message_alls_count = @message_alls.count - when 'poll' - @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc") - @message_alls_count = @message_alls.count - when 'works_reviewers' - @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc") - @message_alls_count = @message_alls.count - when 'works_reply' - @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc") - @message_alls_count = @message_alls.count + # when 'forge_news' + # @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "News", @user).order("created_at desc") + # @message_alls_count = @message_alls.count + # when 'course_news_reply' + # @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Comment", @user).order("created_at desc") + # when 'forge_news_reply' + # @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Comment", @user).order("created_at desc") + # @message_alls_count = @message_alls.count + # when 'poll' + # @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "Poll", @user).order("created_at desc") + # @message_alls_count = @message_alls.count + # when 'works_reviewers' + # @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "StudentWorksScore", @user).order("created_at desc") + # @message_alls_count = @message_alls.count + # when 'works_reply' + # @message_alls = CourseMessage.where("course_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc") + # @message_alls_count = @message_alls.count when 'issue' - @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Issue", @user).order("created_at desc") - @message_alls_count = @message_alls.count - when 'issue_update' # 缺陷状态更新、留言 - @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc") - @message_alls_count = @message_alls.count + @message_alls = ForgeMessage.where("forge_message_type =? or forge_message_type =?" , "Issue", "Journal").where("user_id=?", @user).order("created_at desc") + # when 'issue_update' # 缺陷状态更新、留言 + # @message_alls = ForgeMessage.where("forge_message_type =? and user_id =?", "Journal", @user).order("created_at desc") + # @message_alls_count = @message_alls.count when 'forum' @message_alls = MemoMessage.where("memo_type =? and user_id =?", "Memo", @user).order("created_at desc") - @message_alls_count = @message_alls.count when 'user_feedback' @message_alls = UserFeedbackMessage.where("journals_for_message_type =? and user_id =?", "JournalsForMessage", @user).order("created_at desc") - @message_alls_count = @message_alls.count else render_404 return diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index e0567004a..9b985fddd 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -223,8 +223,12 @@ :title => "#{ma.journals_for_message.notes}", :onmouseover =>"message_titile_show('message_title')", :onmouseout => "message_titile_hide('message_title')" %> +
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • + <% end %> <% end %> @@ -243,9 +247,7 @@ - + +

    <%= l(:label_leave_message) %>

    <% if !User.current.logged?%> @@ -23,21 +25,15 @@
    <% else %> - <%= form_for('new_form', :method => :post, - :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%> - <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> - <%#= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;", - :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%> - -

    - <% end %> -
    -
    -
    - 取  消 - - <%= l(:button_leave_meassge)%> - +
    + <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_course_message'},:method => "post") do |f|%> + <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> + +

    +
    + 取消 + 留言 + <% end%>
    <% end %>
    @@ -54,106 +50,6 @@ diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index bc7f62aea..88455e306 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -769,4 +769,5 @@ a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow: a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;} .ProResultUl span { display:block; float:left;} .ProResultUl li{ line-height:35px; border-bottom:1px solid #dddddd; } -.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;} \ No newline at end of file +.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;} +.mb50{margin-bottom: 50px;} \ No newline at end of file From 0bb0a97fd5a4c8e87e9c37ff30c410a88cadd8f6 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 14:10:41 +0800 Subject: [PATCH 20/24] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=99=E8=A8=80=E5=9B=9E=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=97=A0=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/user.js b/public/javascripts/user.js index ba40af1bd..6a5d93139 100644 --- a/public/javascripts/user.js +++ b/public/javascripts/user.js @@ -1,7 +1,7 @@ //个人动态 $(function(){ KindEditor.ready(function(K){ - $("a[nhname='reply_btn']").on('click',function(){ + $("a[nhname='reply_btn']").live('click',function(){ var params = {}; params.kindutil = K; params.container = $(this).parent().parent('div'); @@ -35,7 +35,7 @@ $(function(){ },300); }); - $("a[nhname='sub_reply_btn']").on('click',function(){ + $("a[nhname='sub_reply_btn']").live('click',function(){ var params = {}; params.kindutil = K; params.container = $(this).parent().parent('div'); From a2079dc6e3cf00f759451a0244ce50e33a9040e5 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 2 Sep 2015 14:13:32 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index af3551704..882f88e41 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -407,20 +407,14 @@ class UsersController < ApplicationController # modified by fq def user_newfeedback - # 更新用户留言列表状态 - feedback_messages = UserFeedbackMessage.where("journals_for_message_type =? and user_id =? and viewed =?", "JournalsForMessage", User.current, false) - feedback_messages.each do|feedback_message| - if User.current.id == feedback_message.user_id - feedback_message.update_attributes(:viewed => true) + # 更新用户留言消息状态 + @user.journals_for_messages.each do |jour_message| + jour_message.user_feedback_messages.each do |userfeedback_message| + if User.current.id == userfeedback_message.user_id + userfeedback_message.update_attributes(:viewed => true) + end end end - # @user.journals_for_messages.each do |jour_message| - # jour_message.user_feedback_messages.each do |userfeedback_message| - # if User.current.id == userfeedback_message.user_id - # userfeedback_message.update_attributes(:viewed => true) - # end - # end - # end # end jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC') if User.current == @user From 53c57668aa0d7522c2a790b637d739a83053bd34 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 14:19:47 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8E=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_activities.html.erb | 5 ++++- app/views/users/show.js.erb | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 2eba84efa..8c9111dce 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -61,4 +61,7 @@ <% end %> <% end %> -<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<% if user_activities.count == 10%> + <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<% end%> + diff --git a/app/views/users/show.js.erb b/app/views/users/show.js.erb index bf7443f8c..eb5de9c6a 100644 --- a/app/views/users/show.js.erb +++ b/app/views/users/show.js.erb @@ -1,4 +1,2 @@ $("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>"); -<% if @user_activities.count < 10%> -$("#show_more_activities").hide(); -<% end%> + From fcdf9b3fc16237b01984437d670664a7d4adf545 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 2 Sep 2015 14:21:50 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index f5da35009..2b57d76a8 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -216,16 +216,8 @@ <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %> -
  • - - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :title => "#{ma.journals_for_message.notes}", - :onmouseover =>"message_titile_show('message_title')", - :onmouseout => "message_titile_hide('message_title')" %> - + <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.journals_for_message.notes}" %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • @@ -248,20 +240,6 @@ - - - - - From 3208574a5eb2fe0efc0d1dfac9a6ebf6d738c130 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 2 Sep 2015 14:31:46 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=92=8C=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E4=BC=A0?= =?UTF-8?q?=E9=80=92page=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_activities.html.erb | 2 +- app/views/users/_user_homework_list.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 2eba84efa..06daedb42 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -61,4 +61,4 @@ <% end %> <% end %> -<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type, :page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index fc6e723f2..677f0303b 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -54,4 +54,4 @@ <% end%> -<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> \ No newline at end of file +<%= link_to "加载更多",user_homeworks_user_path(User.current.id, :page=> page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> \ No newline at end of file