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

public/react/src/modules/courses/boards/BoardsNew.js

@@ -287,7 +287,7 @@ class BoardsNew extends Component{
     const isAdmin = this.props.isAdmin()
     const courseId=this.props.match.params.coursesId;
     const boardId = this.props.match.params.boardId
-
+    const isCourseEnd = this.props.isCourseEnd()
     return(
         <div className="newMain ">
           <AddDirModal {...this.props}
@@ -381,7 +381,7 @@ class BoardsNew extends Component{
                         <div>
                           {menu}
                           {
-                            isAdmin && 
+                            isAdmin && !isCourseEnd && 
                             <React.Fragment>
                               <Divider style={{ margin: '4px 0' }} />
                               <div style={{ padding: '8px', cursor: 'pointer' }} onMouseDown={() => this.refs['addDirModal'].open()}>

public/react/src/modules/courses/boards/index.js

@@ -51,10 +51,7 @@ class Boards extends Component{
     const sort_type = this.state.sort_type
     // page_size
     const url = `/boards/${bid}/messages.json?page_size=15&search=${_serachText || ''}&page=${_page}&sort=0&sort_type=${sort_type}`
-    axios.get(url, { 
+    axios.get(encodeURI(url)).then((response) => {
-      
-      })
-    .then((response) => {
         if (response.data.status == 0 && response.data.data) {
           let _newBoards = response.data.data.messages
           // if (_page > 1) {
@@ -391,7 +388,7 @@ class Boards extends Component{
                         return <li onClick={() => this.moveTo(item)} title={item.name}>{item.name}</li>
                       })
                     }
-                    { isAdmin &&
+                    { isAdmin && !isCourseEnd &&
                      <p className="drop_down_btn">
                       <a href="javascript:void(0)" className="color-grey-6"
                           onClick={()=>this.addDir()}

public/react/src/modules/courses/busyWork/commonWork.js

@@ -124,7 +124,7 @@ class commonWork extends Component{
     if(search!=""){
       url+="&search="+search;
     }
-    axios.get((url)).then((result)=>{
+    axios.get(encodeURI(url)).then((result)=>{
       if(result.status==200){
         this.setState({
           mainList:result.data,

public/react/src/modules/courses/members/modal/AddStudentModal.js

@@ -80,8 +80,9 @@ class AddStudentModal extends Component{
   }
   setVisible = (visible) => {
     if (visible) {
-      this.setState({school_name: this.props.user.user_school})
+      this.setState({school_name: this.props.user.user_school},()=>{
-      this.fetchMemberList()
+        this.fetchMemberList();
+      })
       this.fetchOptions()
     }
     this.refs.modalWrapper.setVisible(visible)

public/react/src/modules/courses/members/studentsList.js

@@ -324,7 +324,7 @@ class studentsList extends Component{
     if(!!searchValue){
       url+='&search='+searchValue;
     }
-    axios.get((url)).then((result)=>{
+    axios.get(encodeURI(url)).then((result)=>{
       if (result.data.students) {
         this.setState({ 
           students: result.data.students,
@@ -675,7 +675,7 @@ class studentsList extends Component{
                       )
                     }) }
                     { course_groups && course_groups.length > 0 && <Divider className="dividerStyle"></Divider> }
-                    { isAdmin &&
+                    { isAdmin && !isCourseEnd && 
                       
                       <p className="drop_down_btn">
                         <a href="javascript:void(0)" className="color-grey-6"

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

@@ -112,7 +112,7 @@ class ShixunHomework extends Component{
     let coursesId=this.props.match.params.coursesId;
     let url="/courses/"+coursesId+"/homework_commons.json?type=4";
 
-    axios.get(url,{
+    axios.get(encodeURI(url),{
       params: {
         search:undefined,
         page:1,

public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js

@@ -95,7 +95,7 @@ class DetailCardsEditAndEdit extends Component{
     if(id!=0){
       url+="&type="+id;
     }
-    axios.get(url).then((result)=>{
+    axios.get(encodeURI(url)).then((result)=>{
       if(result.status===200){
         this.setState({
           ChooseShixunList:result.data,
@@ -369,7 +369,7 @@ class DetailCardsEditAndEdit extends Component{
 				if(type!=0){
 					url+="&type="+type;
 				}
-				axios.get(url).then((result)=>{
+				axios.get(encodeURI(url)).then((result)=>{
 					if(result.status===200){
 
 						let list =result.data.shixun_list;