dev_aliyun
daiao 5 years ago
commit ef05cf1f4a

@ -254,7 +254,7 @@ class Tiding < ActiveRecord::Base
elsif self.tiding_type == "Comment" elsif self.tiding_type == "Comment"
container.present? ? ("评论了你" + (container.parent.present? ? "的回复:" : "发布的项目issue") + message_content(container.notes)) : "" container.present? ? ("评论了你" + (container.parent.present? ? "的回复:" : "发布的项目issue") + message_content(container.notes)) : ""
else else
container.present? ? "更新了Issue#{container.try(:issue).try(:subject)}" : "" "更新了Issue#{container.try(:issue).try(:subject)}"
end end
when 'Issue' when 'Issue'
"指派了Issue给你" + container.subject "指派了Issue给你" + container.subject

@ -1,7 +1,7 @@
<div class="task-popup" style="width: 500px;"> <div class="task-popup" style="width: 500px;">
<p class="font-bd font-18 mt30 mb10 edu-txt-center"><%= notice.try(:subject) %></p> <p class="font-bd font-18 mt30 mb10 edu-txt-center"><%= notice.try(:subject) %></p>
<div class="padding20-30 color-grey-6 font-16"> <div class="padding20-30 color-grey-6 font-16">
<pre class="break-word break-word-firefox"><%= notice.try(:notes) %></pre> <pre class="break-word break-word-firefox"><%= notice.try(:notes).try(:rstrip) %></pre>
</div> </div>
<div class="clearfix edu-txt-center mb30 mt10"> <div class="clearfix edu-txt-center mb30 mt10">
<p class="inline"> <p class="inline">

@ -58,6 +58,6 @@ If you continue to experience problems please contact your Trustie administrator
<p class="font-18"> <p class="font-18">
平台拟于<span style="color: red">2019年7月22日10:40--2019年7月22号11:00</span>进行全面升级,带来不便,敬请谅解! 平台拟于<span style="color: red">2019年7月22日10:40--2019年7月22号11:00</span>进行全面升级,带来不便,敬请谅解!
</p> </p>
</div> </div>user_tidings.html.erb
</body> </body>
</html> </html>

Loading…
Cancel
Save