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

public/react/src/modules/courses/Index.js

@@ -270,7 +270,6 @@ const Ordering=Loadable({
 	loader: () => import('../../modules/courses/ordering/Ordering'),
 	loading: Loading,
 });
-
 class CoursesIndex extends Component{
     constructor(props) {
         super(props)

public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
@@ -78,7 +79,6 @@ class Groupjobbandetails extends Component {
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>*/}
-
 					{/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}
 					{/*	return (*/}
 					{/*		<GroupPackage key={key} attachments={item}></GroupPackage>*/}

public/react/src/modules/courses/completetaskdetails/Completetaskpage.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
 import {WordsBtn, ActionBtn,MarkdownToHtml} from 'educoder';
@@ -228,4 +229,3 @@ class Completetaskpage extends Component {
 }
 
 export default Completetaskpage;
-

public/react/src/modules/courses/completetaskdetails/completetaskdetails.css

@@ -1,3 +1,4 @@
+
 .yslquestionbank1{
     padding-top: 30px !important;
     padding-right: 30px !important;
@@ -11,7 +12,6 @@
 .yslquesmarkdowntext{
     font-size: 16px;
     color: #707070;
-
 }
 .yslquesmat26{
     margin-top: 26px;

public/react/src/modules/courses/groupjobbank/GroupPackage.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
 import {
@@ -36,7 +37,6 @@ class GroupPackage extends Component {
 
 
 
-
 	}
 	// 获取数据地方
 	getTrainingjobsetting = () => {

public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
@@ -79,7 +80,6 @@ class Groupjobbandetails extends Component {
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}
-
 					{/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}
 					{/*	return (*/}
 					{/*		<GroupPackage key={key} attachments={item}></GroupPackage>*/}

public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
 import {WordsBtn, ActionBtn} from 'educoder';
@@ -264,4 +265,3 @@ class GroupjobbankPage extends Component {
 }
 
 export default GroupjobbankPage;
-

public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {

public/react/src/modules/courses/questionbank/Generaljobbankdetails.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
 import {WordsBtn, ActionBtn,getImageUrl} from 'educoder';
@@ -259,4 +260,3 @@ class Generaljobbankdetails extends Component {
 }
 
 export default Generaljobbankdetails;
-

public/react/src/modules/courses/questionbank/Generaljobdetails.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,markdownToHTML, MarkdownToHtml ,getImageUrl} from 'educoder';
 import {

public/react/src/modules/user/usersInfo/InfosBanner.js

@@ -119,11 +119,12 @@ class InfosBanner extends Component{
             </li>}
 
             {/*自己的主页且不是学生显示题库按钮*/}
-						{ user_id===targetuserid&&user_type!="学生"?<li className={`${moduleName == 'topics' ? 'active' : '' }`}>
+						{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+						&&<li className={`${moduleName == 'topics' ? 'active' : '' }`}>
 							<Link
 								onClick={() => this.setState({moduleName: 'topics'})}
 								to={`/users/${username}/topics/personal`}>题库</Link>
-						</li>:""}
+						</li>}
 
           </div>
         </div>