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

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)

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

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)=>{

public/react/src/modules/user/usersInfo/banks/BanksIndex.js

@@ -127,7 +127,7 @@ class BanksIndex extends Component{
           {
             crumbData &&
             <Breadcrumb separator=">" className="breadcrumb mt22">
-              <Breadcrumb.Item href={crumbData && crumbData.is_public == true ?`/topicbank/${this.props.current_user && this.props.current_user.login}/publicly`:`/users/${this.props.current_user && this.props.current_user.login}/topics/personal`}>{ crumbData && crumbData.is_public == true ? '公共' : '我的' }题库</Breadcrumb.Item>
+              <Breadcrumb.Item href={crumbData && crumbData.is_public == true ?`/topicbank/publicly`:`/users/${this.props.current_user && this.props.current_user.login}/topics/personal`}>{ crumbData && crumbData.is_public == true ? '公共' : '我的' }题库</Breadcrumb.Item>
               {
                 crumbData.crumbArray && crumbData.crumbArray.map((item,key)=>{
                   return(