From 139d38e6beb7719af3fb9621ef232bd15691ffcf Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 4 Mar 2020 15:29:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?tpi=E8=AF=84=E8=AE=BA=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=85=AC=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/discusses_controller.rb | 3 +-- .../20200304062256_modidy_hidden_default_for_discusses.rb | 5 +++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20200304062256_modidy_hidden_default_for_discusses.rb diff --git a/app/controllers/discusses_controller.rb b/app/controllers/discusses_controller.rb index 3b1dff96b..e6570a8bf 100644 --- a/app/controllers/discusses_controller.rb +++ b/app/controllers/discusses_controller.rb @@ -81,8 +81,7 @@ class DiscussesController < ApplicationController begin @discuss = Discuss.create!(:dis_id => params[:container_id], :dis_type => params[:container_type], :content => params[:content].gsub(" \;", "").strip, :user_id => current_user.id, - :praise_count => 0, :position => params[:position], :challenge_id => params[:challenge_id], - :hidden => !current_user.admin?) # 管理员回复的能够显示 + :praise_count => 0, :position => params[:position], :challenge_id => params[:challenge_id]) rescue Exception => e uid_logger_error("create discuss failed : #{e.message}") raise Educoder::TipException.new("评论异常，原因：#{e.message}") diff --git a/db/migrate/20200304062256_modidy_hidden_default_for_discusses.rb b/db/migrate/20200304062256_modidy_hidden_default_for_discusses.rb new file mode 100644 index 000000000..331d2c945 --- /dev/null +++ b/db/migrate/20200304062256_modidy_hidden_default_for_discusses.rb @@ -0,0 +1,5 @@ +class ModidyHiddenDefaultForDiscusses < ActiveRecord::Migration[5.2] + def change + change_column :discusses, :hidden, :boolean, :default => false + end +end From 3c518e46c363e1dcf3641de451dbb3031401766f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Wed, 4 Mar 2020 16:40:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/App.js | 62 ++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 29 deletions(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 4c4908771..288afcb10 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -793,37 +793,37 @@ class App extends Component { render={ (props) => () }/> - () - }/> + {/* ()*/} + {/* }/>*/} - () - }/> + {/* ()*/} + {/* }/>*/} () } /> - () - } /> - - () - } /> - () - } /> - () - }/> + {/* ()*/} + {/* } />*/} + + {/* ()*/} + {/* } />*/} + {/* ()*/} + {/* } />*/} + {/* ()*/} + {/* }/>*/} () }/> - () - }/> + {/* ()*/} + {/* }/>*/} + + + {/*()*/} {/* }*/} {/*/>*/} + Date: Wed, 4 Mar 2020 16:47:26 +0800 Subject: [PATCH 3/4] style --- .../react/src/modules/courses/coursesDetail/CoursesLeftNav.js | 1 - .../courses/graduation/topics/GraduateTopicDetailTable.js | 2 +- .../react/src/modules/courses/members/CourseGroupListTable.js | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index f523238c3..80c250134 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -525,7 +525,6 @@ class Coursesleftnav extends Component{ } saveNavmodapost=(url,value,positiontype,coursesId)=>{ - debugger; axios.post(url, {name:value}).then((result)=>{ if(result!=undefined){ diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js index 2e2487601..b0c65009d 100644 --- a/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js +++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicDetailTable.js @@ -228,7 +228,7 @@ class GraduateTopicDetailTable extends Component{ { return 11 ? name : ''} onClick={() => onGoDetail(record)} style={''} - className="overflowHidden1" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}> + className="overflowHidden1 color-dark" style2={{maxWidth: '180px', verticalAlign: 'bottom'}}> {name} } }, @@ -154,7 +154,7 @@ function CourseGroupListTable(props) { {!isCourseEnd && isAdmin && onDelete(record)} style={'grey'}>删除分班} {isStudent && addToDir(record)} style={''}>加入分班} - onGoDetail(record)} style={''}>查看 + onGoDetail(record)} style={''} className="color-dark">查看 } }) From 6b2e836028a002affc9e53b0817d7310700b8540 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Wed, 4 Mar 2020 17:02:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=9E=E8=AE=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/shixuns/ShixunsIndex.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js index 3671bc698..4e11537dc 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunsIndex.js +++ b/public/react/src/modules/tpm/shixuns/ShixunsIndex.js @@ -396,7 +396,7 @@ class ShixunsIndex extends Component { } .myshixin-head{ width: 100%; - height: 300px; + height: 240px; background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.shixun_banner_url === null ?`images/educoder/courses/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.shixun_banner_url)}); background-color: #081C4B; background-position: center;