From d9df8aae28be219e6afd7c90a4f7d2ccbe6c71c2 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 28 Aug 2015 14:38:46 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=82=E7=BC=BA=E9=99=B7=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8E=EF=BC=8C=E4=B8=8D=E5=90=8C=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4=E5=9C=A8=E6=B6=88=E6=81=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=96=B9=E5=BC=8F=202?= =?UTF-8?q?=E3=80=81=E7=BC=BA=E9=99=B7=E6=8C=87=E6=B4=BE=E4=B8=8E=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E5=8F=91=E5=B8=83=E8=80=85=E6=B6=88=E6=81=AF=E5=86=B2?= =?UTF-8?q?=E7=AA=81=E9=97=AE=E9=A2=98=203=E3=80=81=E7=95=99=E8=A8=80?= =?UTF-8?q?=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;