From c0d167d2e26a22630c44f2e1c107a7d498f912e8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 8 Jun 2016 15:23:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=BA=E9=99=B7?=
=?UTF-8?q?=E5=8A=A8=E6=80=81=E7=9A=84=E5=9B=9E=E5=A4=8D=E4=B8=8D=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/issues/_list.html.erb | 17 -----------------
app/views/users/_all_replies.html.erb | 4 ++--
2 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb
index 3ee20ee2a..0eb3b4a0c 100644
--- a/app/views/issues/_list.html.erb
+++ b/app/views/issues/_list.html.erb
@@ -1,22 +1,5 @@
<% issue_list(issues) do |issue, level| -%>
<script>
- function expand_reply(container, btnid) {
- var target = $(container);
- var btn = $(btnid);
- if (btn.data('init') == '0') {
- btn.data('init', 1);
- btn.html('收起回复');
- target.show();
- } else {
- btn.data('init', 0);
- btn.html('展开更多');
- target.hide();
- target.eq(0).show();
- target.eq(1).show();
- target.eq(2).show();
- }
- }
-
$(function () {
sd_create_editor_from_data(<%= issue.id%>, null, "100%", "<%= issue.class.name %>");
});
diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb
index 15c8944fd..20a3289ff 100644
--- a/app/views/users/_all_replies.html.erb
+++ b/app/views/users/_all_replies.html.erb
@@ -18,9 +18,9 @@
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
</span>
</div>
- <% unless comment.content_detail.blank? %>
+ <% if !comment.content_detail.blank? || comment.class == Journal %>
<div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
- <% if comment.class == 'Journal' %>
+ <% if comment.class == Journal %>
<% if comment.details.any? %>
<% details_to_strings(comment.details).each do |string| %>
<p><%= string %></p>
From 7504b353c943cca63da329e579a68eedb9e30f44 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Wed, 8 Jun 2016 16:50:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=8A=A5500=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/organizations/_org_activities.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/organizations/_org_activities.html.erb b/app/views/organizations/_org_activities.html.erb
index 8696cd426..cc1404eb5 100644
--- a/app/views/organizations/_org_activities.html.erb
+++ b/app/views/organizations/_org_activities.html.erb
@@ -57,7 +57,7 @@
<% when 'Message' %>
<%= render :partial => 'users/project_message', :locals => {:activity => Message.find(act.org_act_id),:user_activity_id =>act.id, :is_course=>0, :is_board=>0} %>
<% when 'Project'%>
- <%= render :partial => 'users/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
+ <%= render :partial => 'organizations/project_create', :locals => {:activity => act,:user_activity_id =>act.id} %>
<% end %>
<% end %>
<% if act.container_type == 'Course' %>