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

app/views/admins/shixuns/shared/_list.html.erb

@@ -9,7 +9,7 @@
   <th width="5%">选择</th>
   <th width="6%">状态</th>
   <th width="7%">创建者</th>
-  <th class="eud-pointer" width="13%"><%= sort_tag('创建于', name: 'created_at', path: admins_shixuns_path) %></th>
+  <th width="13%"><%= sort_tag('创建于', name: 'created_on', path: admins_shixuns_path) %></th>
   <th width="5%">单测</th>
   <th width="6%">操作</th>
   </thead>

db/migrate/20190830064803_add_announcement_to_course_modules.rb

@@ -0,0 +1,10 @@
+class AddAnnouncementToCourseModules < ActiveRecord::Migration[5.2]
+  def change
+    Course.all.each do |course|
+      unless course.course_modules.exists?(module_type: "announcement")
+        course.course_modules.where.not(module_type: "activity").update_all("position = position + 1")
+        course.course_modules << CourseModule.new(module_type: "announcement", hidden: 1, module_name: "公告栏", position: 2)
+      end
+    end
+  end
+end

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;