diff --git a/app/controllers/users/question_banks_controller.rb b/app/controllers/users/question_banks_controller.rb index 76523eca4..5c8e69a29 100644 --- a/app/controllers/users/question_banks_controller.rb +++ b/app/controllers/users/question_banks_controller.rb @@ -30,7 +30,7 @@ class Users::QuestionBanksController < Users::BaseController .where(commit_status: 1, exercises: { exercise_bank_id: question_bank_ids }) .group('exercises.exercise_bank_id').count when 'poll' then - PollUser.joins(:poll).where(polls: { exercise_bank_id: question_bank_ids }) + PollUser.joins(:poll).where(commit_status: 1, polls: { exercise_bank_id: question_bank_ids }) .group('polls.exercise_bank_id').count when 'gtask' then GraduationWork.has_committed.joins(:graduation_task) diff --git a/db/migrate/20190907061918_migrate_bank_quotes.rb b/db/migrate/20190907061918_migrate_bank_quotes.rb new file mode 100644 index 000000000..34b2e53a1 --- /dev/null +++ b/db/migrate/20190907061918_migrate_bank_quotes.rb @@ -0,0 +1,23 @@ +class MigrateBankQuotes < ActiveRecord::Migration[5.2] + def change + HomeworkBank.all.each do |bank| + bank.update_column("quotes", bank.homework_commons.count) + end + + GtopicBank.all.each do |bank| + bank.update_column("quotes", bank.graduation_topics.count) + end + + GtaskBank.all.each do |bank| + bank.update_column("quotes", bank.graduation_tasks.count) + end + + ExerciseBank.all.each do |bank| + if bank.container_type == 'Exercise' + bank.update_column("quotes", bank.exercises.count) + elsif bank.container_type == 'Poll' + bank.update_column("quotes", bank.polls.count) + end + end + end +end diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index db96818e5..5b344270e 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -70,6 +70,14 @@ class InfosTopics extends Component{ // }else{ // // } + + let types=this.props.match.params.topicstype; + let professional_certification=this.props.current_user&&this.props.current_user.professional_certification; + + + if(professional_certification===false&&types==="publicly"){ + + }else{ this.setState({ isSpin:true }) @@ -77,9 +85,9 @@ class InfosTopics extends Component{ let user_id=""; if(types==="publicly"){ - user_id=this.props.current_user&&this.props.current_user.login; + user_id=this.props.current_user&&this.props.current_user.login; }else{ - user_id=this.props.match.params&&this.props.match.params.username; + user_id=this.props.match.params&&this.props.match.params.username; } @@ -112,6 +120,8 @@ class InfosTopics extends Component{ }) }); + } + } searchCategory=(type)=>{ diff --git a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js index e921022c3..121119a0d 100644 --- a/public/react/src/modules/user/usersInfo/banks/BanksIndex.js +++ b/public/react/src/modules/user/usersInfo/banks/BanksIndex.js @@ -127,7 +127,7 @@ class BanksIndex extends Component{ { crumbData && - { crumbData && crumbData.is_public == true ? '公共' : '我的' }题库 + { crumbData && crumbData.is_public == true ? '公共' : '我的' }题库 { crumbData.crumbArray && crumbData.crumbArray.map((item,key)=>{ return(