Merge remote-tracking branch 'origin/topic_bank' into topic_bank

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

@@ -87,8 +87,9 @@ class Groupjobbandetails extends Component {
 					<div className="mt24">
 					{datas.attachments === undefined ? "" :
 					<AttachmentsList {...this.state} {...this.props} attachments={datas.attachments} ></AttachmentsList>}
-					</div>
 					<GroupPackage2 datas={datas} bool={false}></GroupPackage2>
+					</div>
+
 
 				</div>
 

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

@@ -64,7 +64,7 @@ class Groupjobquesanswer extends Component {
 			<div className=" clearfix  edu-back-white "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
 				<div className="yslquestionbank1">
 					{
-						datas.reference_answer===null?
+						datas&&(datas.reference_answer===null?
 								""
 								:datas.reference_answer==="null"?
 									""									:
@@ -72,6 +72,7 @@ class Groupjobquesanswer extends Component {
 										""
 										:
 										<MarkdownToHtml content={datas.reference_answer} selector="work_content" className="mb10 yslquesHeigth"></MarkdownToHtml>
+						)
 					}
 
 					{datas.reference_attachments === undefined ?

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

@@ -82,7 +82,7 @@ class Generaljobanswer extends Component {
 					{/*</div>*/}
 
 					{
-						datas.reference_answer===null?
+						datas&&(datas.reference_answer===null?
 							""
 							:datas.reference_answer==="null"?
 							""									:
@@ -90,6 +90,7 @@ class Generaljobanswer extends Component {
 								""
 								:
 								<MarkdownToHtml content={datas.reference_answer} selector="work_content" className="mb10 yslquesHeigth "></MarkdownToHtml>
+						)
 					}
 
 					{datas.reference_attachments === undefined ?