Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/memos_controller.rb

@@ -147,16 +147,15 @@ class MemosController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         memo = Memo.find_by!(id: params[:parent_id])
-        reply = Memo.new
-        reply.content = params[:content]
-        reply.author = current_user
-        reply.forum_id = memo.forum_id
-        reply.subject = memo.subject
-        reply.root_id = memo.root_id || memo.id
-        memo.children << reply
-        m = Memo.find_by!(id: reply.root_id)
+        @reply = Memo.new
+        @reply.content = params[:content]
+        @reply.author = current_user
+        @reply.forum_id = memo.forum_id
+        @reply.subject = memo.subject
+        @reply.root_id = memo.root_id || memo.id
+        memo.children << @reply
+        m = Memo.find_by!(id: @reply.root_id)
         m.increment!(:all_replies_count)
-        normal_status("回复成功")
       rescue Exception => e
         tip_exception("回复失败，原因：#{e}")
         raise ActiveRecord::Rollback

app/views/memos/reply.json.jbuilder

@@ -0,0 +1,2 @@
+json.(@reply, :id, :subject, :content, :hidden, :forum_id, :author_id, :all_replies_count, :is_md, :parent_id, :root_id,
+  :reward, :sticky, :updated_at, :created_at, :viewed_count)

db/migrate/20190801075337_add_praises_count_to_memos.rb

@@ -0,0 +1,12 @@
+class AddPraisesCountToMemos < ActiveRecord::Migration[5.2]
+  def change
+    add_column :memos, :praises_count, :integer, :default => 0
+
+    memos = Memo.includes(:praise_treads).all
+    memos.find_each do |m|
+      puts("####{m.id}")
+      praises_count = m.praise_treads.select{|pt| pt.praise_or_tread == 1}.count
+      m.update_column(:praises_count, praises_count)
+    end
+  end
+end

public/react/src/modules/tpm/challengesnew/TPMevaluation.js

@@ -981,7 +981,7 @@ export default class TPMevaluation extends Component {
 
 					{pathoptionvalue===1||pathoptionvalue===5||pathoptionvalue===6?<div className="edu-back-white mb10 clearfix">
 						<div className="padding40-20">
-							<p className="color-grey-6 font-16 mb20">待处理图片路径</p>
+							<p className="color-grey-6 font-16 mb20">待处理文件路径</p>
 							<div className="df">
 								<div className="flex1 mr20">
 									<input type="text" className="input-100-45" autoComplete="off"
@@ -1003,7 +1003,7 @@ export default class TPMevaluation extends Component {
 
 					{pathoptionvalue===1||pathoptionvalue===5||pathoptionvalue===6? <div className="edu-back-white mb10 clearfix">
 						<div className="padding40-20">
-							<p className="color-grey-6 font-16 mb20">标准答案图片路径</p>
+							<p className="color-grey-6 font-16 mb20">标准答案文件路径</p>
 							<div className="df">
 								<div className="flex1 mr20">
 									<input type="text" className="input-100-45" autoComplete="off"