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

app/controllers/concerns/git_common.rb

@@ -47,6 +47,7 @@ module GitCommon
   def add_file
     @path, message, content = params[:path].strip, params[:message], params[:content]
     author_name, author_email = current_user.real_name, current_user.git_mail
+    Logger.info("...repo_path is #{@repo_path}")
     @content = GitService.update_file(repo_path: @repo_path,
                                       file_path: @path,
                                       message: message,

app/views/games/picture_display.json.jbuilder

@@ -19,7 +19,7 @@ if @type == "image"
   end
 
 elsif @type == "html"
-  json.iframe_src File.read("#{@user_path}/#{@user_picture[0]}")&.html_safe
+  json.iframe_src File.read("#{@user_path}/#{@user_picture[0]}")&.html_safe if @user_picture[0].present?
 elsif @type == "txt"
   json.contents @contents.to_s
 elsif @type =="qrcode"

public/react/src/context/EvaluateSuccessEffectDisplay.js

@@ -21,7 +21,7 @@ class EvaluateSuccessEffectDisplay extends Component {
     componentDidMount() {
         if (this.props.type == 'html') {
             const iframe = document.getElementById('_displayIframe')
-            if (iframe && iframe.contentWindow) {
+            if (iframe && iframe.contentWindow && this.props.iframe_src) {
                 iframe.contentWindow.open()
                 iframe.contentWindow.document.write(this.props.iframe_src);
                 iframe.contentWindow.document.close();

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

@@ -462,27 +462,25 @@ class CoursesIndex extends Component{
         return (
             <Switch {...this.props}>
               {/*毕设任务题库详情*/}
-              <Route path="/courses/completetask/:workid"
+              <Route path="/banks/gtopic_topics/:workid"
                      render={
                        (props) => (<Completetaskpage {...this.props} {...props} {...this.state} />)
                      }
               ></Route>
               {/*毕设内容题库详情*/}
-              <Route path="/courses/completetopic/:workid"
+              <Route path="/banks/gtask_topics/:workid"
                      render={
                        (props) => (<CompletetopicdePage {...this.props} {...props} {...this.state} />)
                      }
               ></Route>
-              {/*GroupjobbankPage*/}
               {/*分组作业题库详情*/}
-              <Route path="/courses/groupingwork/:workid"
+              <Route path="/banks/group_topics/:workid"
                      render={
                        (props) => (<GroupjobbankPage {...this.props} {...props} {...this.state} />)
                      }
               ></Route>
-              {/*Generaljobbankdetails*/}
               {/*  普通作业题库详情*/}
-              <Route path="/courses/ordinarywork/:workid"
+              <Route path="/banks/normal_topics/:workid"
                      render={
                        (props) => (<Generaljobbankdetails {...this.props} {...props} {...this.state} />)
                      }

public/react/src/modules/courses/poll/PollNew.js

@@ -2152,7 +2152,7 @@ class PollNew extends Component {
 							arr[i].question.max_choices = length;
 						}else{
 							arr[i].question.min_choices = parseInt(value);
-							arr[i].question.max_choices = length;
+							arr[i].question.max_choices = max;
 						}
 					}catch (e) {
 						arr[i].question.min_choices = 2;