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

app/controllers/attachments_controller.rb

@@ -18,7 +18,7 @@ class AttachmentsController < ApplicationController
 
     pdf_attachment = params[:disposition] || "attachment"
     if pdf_attachment == "inline"
-      render pdf: absolute_path(local_path(@file)), filename: @file.filename, disposition: 'inline', type: @file.content_type.presence || 'application/octet-stream'
+      send_file absolute_path(local_path(@file)),filename: @file.filename, disposition: 'inline',type: 'application/pdf'
     else
       send_file(absolute_path(local_path(@file)), filename: @file.filename,stream:false, type: @file.content_type.presence || 'application/octet-stream')
     end

app/controllers/users/video_auths_controller.rb

@@ -1,5 +1,5 @@
 class Users::VideoAuthsController < Users::BaseController
-  before_action :private_user_resources!, :require_auth_teacher!
+  before_action :private_user_resources!, :check_account, :require_auth_teacher!
 
   def create
     result = Videos::CreateAuthService.call(observed_user, create_params)

app/controllers/users/videos_controller.rb

@@ -1,5 +1,5 @@
 class Users::VideosController < Users::BaseController
-  before_action :private_user_resources!, :require_auth_teacher!
+  before_action :private_user_resources!, :check_account, :require_auth_teacher!
 
   helper_method :current_video
 

app/helpers/application_helper.rb

@@ -52,7 +52,8 @@ module ApplicationHelper
 
     shixun_id = shixun_id.blank? ? -1 : shixun_id.join(",")
     Shixun.select([:id, :name, :user_id, :challenges_count, :myshixuns_count, :trainee, :identifier]).where("id
-                   in(#{shixun_id}) or homepage_show =1").unhidden.order("myshixuns_count desc, homepage_show asc").limit(3)
+                   in(#{shixun_id})").unhidden.order("homepage_show asc, myshixuns_count desc").limit(3)
+
   end
 
   # 相关推荐

app/models/user.rb

@@ -268,7 +268,7 @@ class User < ApplicationRecord
 
   # 实训路径管理员
   def creator_of_subject?(subject)
-    subject.user_id == id
+    subject.user_id == id || admin?
   end
 
   # 实训路径：合作者、admin

app/views/attachments/_attachment.json.jbuilder

@@ -13,5 +13,3 @@ json.downloads_count attachment.downloads_count
 json.created_on attachment.created_on
 json.is_pdf attachment.is_pdf?
 json.url attachment.is_pdf? ? download_url(attachment,disposition:"inline") : download_url(attachment)
-
-# json.url download_url(attachment) unless attachment.locked?(@is_member)

app/views/subjects/show.json.jbuilder

@@ -11,6 +11,7 @@ json.allow_statistics @is_manager
 json.allow_send @user.logged?
 json.allow_visit @subject.status > 1 || @is_manager
 json.allow_add_member @is_manager
+json.is_creator @is_creator
 
 if @subject.excellent
   json.courses @courses do |course|

public/react/src/common/TextUtil.js

@@ -70,4 +70,9 @@ export function appendFileSizeToUploadFileAll(fileList) {
         return item
     }) 
 }
-export const uploadNameSizeSeperator = '　　'
+export const uploadNameSizeSeperator = '　　'
+
+export const sortDirections = ["ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
+      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
+      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", 
+      "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", "ascend", "descend", ]

public/react/src/common/educoder.js

@@ -17,7 +17,7 @@ export { updatePageParams as updatePageParams } from                './RouterUti
 export { bytesToSize as bytesToSize } from                './UnitUtil';
 
 export { markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
-        downloadFile } from 	'./TextUtil'
+        downloadFile, sortDirections } from 	'./TextUtil'
 export { handleDateString, getNextHalfHourOfMoment,formatDuring } from 	'./DateUtil'
 
 

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

@@ -8,7 +8,7 @@ import Titlesearchsection from '../common/titleSearch/TitleSearchSection'
 import ColorCountText from '../common/titleSearch/ColorCountText'
 import update from 'immutability-helper'
 
-import { WordsBtn, ConditionToolTip, on, off ,trigger} from 'educoder'
+import { WordsBtn, ConditionToolTip, on, off ,trigger, sortDirections } from 'educoder'
 
 import axios from 'axios'
 
@@ -63,6 +63,7 @@ function buildColumns(that) {
     width: 120,
     key: 'name',
     sorter: showSorter,
+    sortDirections: sortDirections,
     sortOrder: sortedInfo.columnKey === 'name' && sortedInfo.order,
     render: (name, record) => {
       return <a href={`/users/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px'}} 
@@ -75,6 +76,7 @@ function buildColumns(that) {
     sorter: showSorter,
     // 'ascend' | 'descend'
     defaultSortOrder: 'ascend',
+    sortDirections: sortDirections,
     sortOrder: sortedInfo.columnKey === 'role' && sortedInfo.order,
 
   }] 
@@ -116,6 +118,7 @@ function buildColumns(that) {
       title: '答辩组',
       // width: 90,
       sorter: showSorter,
+      sortDirections: sortDirections,
       key: 'graduation_group',
       dataIndex: 'graduation_group',
       sortOrder: sortedInfo.columnKey === 'graduation_group' && sortedInfo.order,