diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c5e785a53..bd546c886 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -310,6 +310,11 @@ class UsersController < ApplicationController
@user_activity_id = params[:user_activity_id]
@activity_id = params[:activity_id]
@type = 'Issue'
+ when 'Training_task'
+ @reply = Journal.find params[:reply_id]
+ @user_activity_id = params[:user_activity_id]
+ @activity_id = params[:activity_id]
+ @type = 'Training_task'
when 'Syllabus'
@reply = JournalsForMessage.find params[:reply_id]
@type = 'Syllabus'
diff --git a/app/views/projects/_project_issue_expand_show.html.erb b/app/views/projects/_project_issue_expand_show.html.erb
index 2debb7789..adbf662cc 100644
--- a/app/views/projects/_project_issue_expand_show.html.erb
+++ b/app/views/projects/_project_issue_expand_show.html.erb
@@ -34,23 +34,32 @@
- <%= link_to(
- l(:button_reply),
- {:controller => 'users', :action => 'reply_to', :reply_id => comment.id, :type => 'Issue', :user_activity_id => user_activity_id, :activity_id => activity.id, :is_project => true},
- :remote => true,
- :method => 'get',
- :title => l(:button_reply)) %>
+ <%= link_to(l(:button_reply),
+ {:controller => 'users',
+ :action => 'reply_to',
+ :reply_id => comment.id,
+ :type => 'Training_task',
+ :user_activity_id => user_activity_id,
+ :activity_id => activity.id,
+ :is_project => true},
+ :remote => true,
+ :method => 'get',
+ :title => l(:button_reply)) %>
- <%= link_to(
- l(:button_delete),
- {:controller => 'issues',:action => 'delete_journal', :id => activity.id,:journal_id=>comment.id, :user_activity_id => user_activity_id, :is_project => true},
- :method => 'get',
- :confirm => l(:text_are_you_sure),
- :remote=>true,
- :id => "delete_reply_#{activity.id}_#{comment.id}",
- :class => 'fr mr20 undis',
- :title => l(:button_delete)
+ <%= link_to(l(:button_delete),
+ {:controller => 'training_tasks',
+ :action => 'delete_journal',
+ :id => activity.id,
+ :journal_id=>comment.id,
+ :user_activity_id => user_activity_id,
+ :is_project => true},
+ :method => 'get',
+ :confirm => l(:text_are_you_sure),
+ :remote=>true,
+ :id => "delete_reply_#{activity.id}_#{comment.id}",
+ :class => 'fr mr20 undis',
+ :title => l(:button_delete)
) if comment.user_id == User.current.id %>
@@ -70,11 +79,11 @@
<% if User.current.logged? %>
- <%= form_for('new_form',:url => add_journal_issue_path(activity.id, :user_activity_id => user_activity_id, :is_project => true),:method => "post", :remote => true) do |f| %>
-
-
+ <%= form_for('new_form', :url => add_journal_training_task_path(activity.id, :user_activity_id => user_activity_id, :is_project => true), :method => "post", :remote => true) do |f| %>
+
+
-
发送
+
发送111
<% end%>
diff --git a/app/views/projects/_project_issue_reply.html.erb b/app/views/projects/_project_issue_reply.html.erb
index 95ffc1962..d67d4aabc 100644
--- a/app/views/projects/_project_issue_reply.html.erb
+++ b/app/views/projects/_project_issue_reply.html.erb
@@ -4,6 +4,6 @@
<%= render :partial => 'projects/project_reply_banner', :locals => {:count => count, :activity => activity, :user_activity_id => user_activity_id, :expand_more =>no_children_comments[:three_more]} %>
- <%= render :partial => "projects/project_issue_expand_show", :locals => {:comments => no_children_comments[:no_children_comments], :activity => activity, :user_activity_id => user_activity_id} %>
+ <%= render :partial => "projects/project_issue_expand_show", :locals => { :comments => no_children_comments[:no_children_comments], :activity => activity, :user_activity_id => user_activity_id} %>
\ No newline at end of file
diff --git a/app/views/projects/_project_reply_banner.html.erb b/app/views/projects/_project_reply_banner.html.erb
index a1bbcdcbf..27d7d029a 100644
--- a/app/views/projects/_project_reply_banner.html.erb
+++ b/app/views/projects/_project_reply_banner.html.erb
@@ -3,7 +3,7 @@
回复
︿
<%= count>0 ? "(#{count})" : "" %>▪
-
+
<%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
@@ -11,15 +11,15 @@
<% if expand_more %>
<% if activity.class.to_s == 'Issue' %>
-
+
展开更多
<% elsif activity.class.to_s == 'Message' %>
-
+
展开更多
<% else %>
-
+
展开更多
<% end %>
diff --git a/app/views/projects/_reply_to.html.erb b/app/views/projects/_reply_to.html.erb
index 943d0addf..482334738 100644
--- a/app/views/projects/_reply_to.html.erb
+++ b/app/views/projects/_reply_to.html.erb
@@ -26,6 +26,16 @@
<% end %>
+ <% elsif @type == 'Training_task' %>
+ <%= form_for('new_form', :url => add_reply_training_task_path(reply.training_task.id, :is_project => true),:method => "post", :remote => true) do |f|%>
+ <%= hidden_field_tag 'journal_id',params[:journal_id],:value =>reply.id %>
+ <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+
+
+
发送
+
+
+ <% end %>
<% end %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 5ad7c3f5f..54682f4ba 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -24,7 +24,7 @@
<%= link_to "资源库动态", {:controller => "projects", :action => "show", :type => "attachment"}, :class => "homepagePostTypeResource resourcesGrey" %>
<%= link_to "讨论区动态", {:controller => "projects", :action => "show", :type => "message"}, :class => "homepagePostTypeForum postTypeGrey" %>
-
<%= link_to "讨论区动态", {:controller => "projects", :action => "show", :type => "training_task"}, :class => "homepagePostTypeForum postTypeGrey" %>
+
<%= link_to "实训任务动态", {:controller => "projects", :action => "show", :type => "training_task"}, :class => "homepagePostTypeForum postTypeGrey" %>
diff --git a/app/views/training_tasks/add_journal.js.erb b/app/views/training_tasks/add_journal.js.erb
index d3f5a12fa..b76e03c68 100644
--- a/app/views/training_tasks/add_journal.js.erb
+++ b/app/views/training_tasks/add_journal.js.erb
@@ -1 +1,6 @@
-
+<% if params[:is_project] %>
+ $("#div_user_issue_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'projects/project_issue_reply', :locals => {:activity => @training_task, :user_activity_id => @user_activity_id}) %>");
+<% else %>
+ $("#div_user_issue_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @training_task, :user_activity_id => @user_activity_id}) %>");
+<% end %>
+sd_create_editor_from_data(<%= @user_activity_id %>, null, "100%", "UserActivity");
\ No newline at end of file
diff --git a/app/views/training_tasks/add_reply.js.erb b/app/views/training_tasks/add_reply.js.erb
new file mode 100644
index 000000000..016e13176
--- /dev/null
+++ b/app/views/training_tasks/add_reply.js.erb
@@ -0,0 +1,13 @@
+<% if @user_activity_id %>
+<%# 动态中 %>
+<% if params[:is_project] %>
+$("#div_user_issue_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'projects/project_issue_reply', :locals => {:activity => @training_task, :user_activity_id => @user_activity_id}) %>");
+<% else %>
+$("#div_user_issue_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @training_task, :user_activity_id => @user_activity_id}) %>");
+<% end %>
+
+sd_create_editor_from_data(<%= @user_activity_id %>, null, "100%","<%= @training_task.class.name %>");
+<% else %>
+<%# issue详情 %>
+<%= render "jounal_refresh" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/training_tasks/delete_journal.js.erb b/app/views/training_tasks/delete_journal.js.erb
new file mode 100644
index 000000000..1a11d3488
--- /dev/null
+++ b/app/views/training_tasks/delete_journal.js.erb
@@ -0,0 +1,14 @@
+<% if @user_activity_id %>
+ <% if @is_project %>
+ $("#div_user_issue_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'projects/project_issue_reply',
+ :locals => {:activity => @training_task,
+ :user_activity_id => @user_activity_id}) %>");
+ <% else %>
+ $("#div_user_issue_reply_<%= @user_activity_id %>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply',
+ :locals => {:activity => @training_task,
+ :user_activity_id => @user_activity_id}) %>");
+ <% end %>
+ sd_create_editor_from_data(<%= @user_activity_id %>, null, "100%","<%= @training_task.class.name %>");
+<% else %>
+ <%= render "jounal_refresh" %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/training_tasks/reply.js.erb b/app/views/training_tasks/reply.js.erb
index 3c7acd927..d53160573 100644
--- a/app/views/training_tasks/reply.js.erb
+++ b/app/views/training_tasks/reply.js.erb
@@ -1,3 +1,6 @@
+<% if params[:is_project]%>
+$("#reply_message_<%= @jour.id %>").
+<% else %>
if($("#reply_message_<%= @jour.id %>").length > 0) {
$("#reply_message_<%= @jour.id %>").replaceWith("<%= escape_javascript(render :partial => 'training_tasks/training_tasks_reply_ke_form') %>");
$(function(){
@@ -5,4 +8,5 @@ if($("#reply_message_<%= @jour.id %>").length > 0) {
});
}else if($("#reply_to_message_<%= @jour.id %>").length >0) {
$("#reply_to_message_<%= @jour.id %>").replaceWith("
");
-}
\ No newline at end of file
+}
+<% end %>
\ No newline at end of file
diff --git a/app/views/training_tasks/show.js.erb b/app/views/training_tasks/show.js.erb
index a465dab32..9db0abd72 100644
--- a/app/views/training_tasks/show.js.erb
+++ b/app/views/training_tasks/show.js.erb
@@ -6,7 +6,7 @@ issue_desc_editor = KindEditor.create('#issue_description',
{"width":"85%",
"resizeType":0,
"no_label":true,
- "at_id":<%= @training_task.project_id%>,
+ "at_id":<%= @training_task.project_id %>,
"at_type":"Project",
"autoHeightMode":true,
"afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);};if(typeof enableAt ==='function'){enableAt(self, \"<%= @training_task.project_id %>\", 'Project');}; this.loadPlugin('autoheight')})",