From c3e494648fb74a0ec04dce6915db921ad3b10efa Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 12 Mar 2020 22:40:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 1 + app/views/files/index.json.jbuilder | 1 + 2 files changed, 2 insertions(+) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index e40c986ca..03e6dad24 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -24,6 +24,7 @@ class FilesController < ApplicationController get_category(@course, @course_second_category_id) @total_count = @attachments.size + @unlink_count = @attachments.no_link.size if @user.course_identity(@course) == 5 member = @course.course_members.find_by(user_id: current_user.id, is_active: 1) diff --git a/app/views/files/index.json.jbuilder b/app/views/files/index.json.jbuilder index e7805c0d8..e0c21e232 100644 --- a/app/views/files/index.json.jbuilder +++ b/app/views/files/index.json.jbuilder @@ -5,6 +5,7 @@ json.data do json.total_count @total_count json.publish_count @publish_count json.unpublish_count @unpublish_count + json.unlink_count @unlink_count json.course_is_public @course.is_public? json.files do json.array! @attachments do |attachment| From cebe86c26271a592b3d44f6bb5f6cd661ed63403 Mon Sep 17 00:00:00 2001 From: caicai8 <1149225589@qq.com> Date: Thu, 12 Mar 2020 22:55:24 +0800 Subject: [PATCH 2/2] flex1 --- .../react/src/modules/tpm/shixunchild/Challenges/Challenges.js | 2 +- .../src/modules/tpm/shixunchild/shixunchildCss/Challenges.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js index 32263676f..640562f5e 100644 --- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js +++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js @@ -745,7 +745,7 @@ class Challenges extends Component {