From a7eff50c6114f8c253e99b2d6d64a6bf5e368e91 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 27 Aug 2015 10:32:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=8F=91=E9=80=81=EF=BC=9A=E5=9B=9E=E5=A4=8D=E4=B8=9C=E5=AE=B6?= =?UTF-8?q?=EF=BC=8C=E5=9B=9E=E5=A4=8D=E4=BA=BA=E5=92=8C=E4=B8=9C=E5=AE=B6?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E4=B8=80=E4=BA=BA=E6=94=B6=E5=88=B0=E6=B6=88?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message.rb | 24 +----------------------- app/models/user.rb | 1 + 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 1f5f2e1a6..6f775e7a2 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -212,33 +212,11 @@ class JournalsForMessage < ActiveRecord::Base if self.user_id != self.reply_id # 添加我回复的那个人 receivers << reply_to end - if self.user_id != self.parent.jour_id # 给东家发信息 + if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发 receivers << self.parent.jour end - # if self.user_id != self.parent.user_id - # receivers << reply_to - # if self.reply_id != self.parent.user_id - # receivers << self.parent.user - # end - # else - # receivers << reply_to - # end - - # 添加留言回复人 - #reply_to = User.find(self.reply_id) - #if self.user_id != self.parent.user_id && self.user_id != self.parent.jour_id # 如果回帖人不是用户自己 - # receivers << self.parent.user - # if self.reply_id != self.parent.user_id - # receivers << reply_to - # end - #else # 用户自己回复别人的，别人收到消息通知 - # if self.user_id != self.reply_id # 过滤掉自己回复自己的 - # receivers << reply_to - # end - #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) end diff --git a/app/models/user.rb b/app/models/user.rb index 61dd60eec..b08b29981 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -263,6 +263,7 @@ class User < Principal user_memo_count = MemoMessage.where("user_id =? and viewed =?", User.current.id, 0).count messages_count = course_count + forge_count + user_feedback_count + user_memo_count end + # 查询指派给我的缺陷记录 def issue_status_update self.status_updates From 1b9da8d963fb41fa06a909b8b3d2179c56546e4b Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 27 Aug 2015 16:57:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 1 + app/views/users/user_messages.html.erb | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a8243c5a5..f8eeb289a 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -176,6 +176,7 @@ class UsersController < ApplicationController render_404 return end + @message_alls = paginateHelper @message_alls,15 respond_to do |format| format.html{render :layout=>'new_base_user'} end diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 97a159884..549355c29 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -86,14 +86,14 @@
  • <%=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" %>
    • <% if 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, :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %>
  • <%= time_tag(ma.course_message.created_on).html_safe %>
    • <% else %> -
  • ">回复了帖子
    • +
  • ">评论了课程帖子
  • <%=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, :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", @@ -165,7 +165,7 @@
  • <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %>
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
    • -
  • "><%= ma.forge_message.parent_id.nil? ? "发布了帖子" : "回复了帖子" %>
    • +
  • "><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子" : "评论了项目帖子" %>
  • <%=link_to ma.forge_message.subject.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, @@ -193,7 +193,7 @@
    • <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author) %>
    • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue" %>
      • -
    • ">回复了新闻
      • +
    • ">评论了新闻
    • <%= link_to "#{ma.forge_message.comments.html_safe}", {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.forge_message.comments.html_safe}"%>
      • @@ -238,7 +238,11 @@ <% end %> <% end %> <% end %> +
        + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
      <% end %> + <% else %>
      您目前还没有相关消息！
      From 9709692a087e5a4a18f161a8fb57689efdc2a83a Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 28 Aug 2015 09:55:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E7=9A=84=E6=98=BE=E7=A4=BA=E4=B8=AA=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/helpers/users_helper.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index f8eeb289a..7c2b51470 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -176,7 +176,7 @@ class UsersController < ApplicationController render_404 return end - @message_alls = paginateHelper @message_alls,15 + @message_alls = paginateHelper @message_alls,25 respond_to do |format| format.html{render :layout=>'new_base_user'} end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index ebfd9f881..2f74b1f7d 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -425,6 +425,7 @@ module UsersHelper return str.html_safe end + # journal.details 记录每个动作的新旧值 def get_issue_des_update(journal) arr = details_to_strings(journal.details,true) arr << journal.notes From d9df8aae28be219e6afd7c90a4f7d2ccbe6c71c2 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 28 Aug 2015 14:38:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?1=E3=80=82=E7=BC=BA=E9=99=B7=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9B=B4=E6=96=B0=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4=E5=9C=A8=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=202=E3=80=81=E7=BC=BA=E9=99=B7=E6=8C=87=E6=B4=BE=E4=B8=8E?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=8F=91=E5=B8=83=E8=80=85=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98=203=E3=80=81=E7=95=99?= =?UTF-8?q?=E8=A8=80=E5=86=85=E5=AE=B9=E7=9A=84=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/issues_helper.rb | 16 ++++++++++++++++ app/helpers/users_helper.rb | 7 +++++-- app/models/journal.rb | 2 +- .../mailer/send_for_user_activities.html.erb | 1 + app/views/users/user_messages.html.erb | 4 ++-- public/stylesheets/new_user.css | 4 +++- 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index a26d2661a..412c3f889 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -380,6 +380,22 @@ module IssuesHelper value = content_tag("i", h(value)) if value end end + # 缺陷更新结果在消息中显示样式 + if no_html == "message" + label = content_tag(:span, label, :class => "issue_update_message") + old_value = content_tag("span", h(old_value)) if detail.old_value + old_value = content_tag("del", old_value) if detail.old_value and detail.value.blank? + if detail.property == 'attachment' && !value.blank? && atta = Attachment.find_by_id(detail.prop_key) + # Link to the attachment if it has not been removed + if options[:token].nil? + value = atta.filename + else + value = atta.filename + end + else + value = content_tag(:span, h(value), :class => "issue_update_message_value") if value + end + end if detail.property == 'attr' && detail.prop_key == 'description' s = l(:text_journal_changed_no_detail, :label => label) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 2f74b1f7d..e7ab001da 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -427,8 +427,11 @@ module UsersHelper # journal.details 记录每个动作的新旧值 def get_issue_des_update(journal) - arr = details_to_strings(journal.details,true) - arr << journal.notes + no_html = "message" + arr = details_to_strings(journal.details, no_html) + unless journal.notes.empty? + arr << "留言内容：" + journal.notes + end str = '' arr.each { |item| str = str+item } return str diff --git a/app/models/journal.rb b/app/models/journal.rb index 3a9f5a89d..0d86d12ff 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -174,7 +174,7 @@ class Journal < ActiveRecord::Base if self.user_id != self.issue.author_id self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id, :project_id => self.issue.project_id, :viewed => false) end - if self.user_id != self.issue.assigned_to_id # 指派人不是自己的话，则给指派人发送 + if self.user_id != self.issue.assigned_to_id && self.issue.assigned_to_id != self.issue.author_id # 指派人不是自己的话，则给指派人发送 self.forge_messages << ForgeMessage.new(:user_id => self.issue.assigned_to_id, :project_id => self.issue.project_id, :viewed => false) end end diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb index 7bd1b0bc2..0233f7a42 100644 --- a/app/views/mailer/send_for_user_activities.html.erb +++ b/app/views/mailer/send_for_user_activities.html.erb @@ -327,6 +327,7 @@ <% end %>
      + <% @project_news_comments.each do |project_news_comment|%>
    • diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 549355c29..2f88b1d85 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -153,9 +153,9 @@
    • "> 更新了问题状态
    • - <%= link_to get_issue_des_update(ma.forge_message), + <%= link_to get_issue_des_update(ma.forge_message).html_safe, issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :title => "#{get_issue_des_update(ma.forge_message)}" %> + :title => "#{get_issue_des_update(ma.forge_message).html_safe}" %>
    • <%= time_tag(ma.forge_message.created_on).html_safe %>
    diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 22e13709b..86dc0a440 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -875,7 +875,9 @@ img.ui-datepicker-trigger { .homepageNewsTypeNotRead {width:95px; 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;} - +/*缺陷更新动态在消息中显示样式*/ +.issue_update_message{padding-left: 2px; margin-right: 3px;} +.issue_update_message_value{margin-right: 8px;} #attachments_fields input.filename { border: 0; height: 1.8em;