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| 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 {
-
+
{/*onClick={() => this.EditTraining(this.props.identity, item.challenge_id, "/editquestion")}*/} {this.props.identity<5? diff --git a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css index 69661463d..19451dff7 100644 --- a/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css +++ b/public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css @@ -268,7 +268,7 @@ justify-content: space-between; align-items: center; } -.flex1{ +.flex1.width0{ flex: 1; width: 0; }