Merge branches 'dev_Ysl' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

app/controllers/bidding_users_controller.rb

@@ -9,8 +9,7 @@ class BiddingUsersController < ApplicationController
   end
 
   def win
-    package = current_user.project_packages.find(params[:project_package_id])
-    ProjectPackages::WinBiddingService.call(package, params)
+    ProjectPackages::WinBiddingService.call(current_package, current_user, params)
     render_ok
   rescue ProjectPackages::WinBiddingService::Error => ex
     render_error(ex.message)

app/controllers/files_controller.rb

@@ -17,8 +17,8 @@ class FilesController < ApplicationController
     sort_type = params[:sort_type] || 'created_on' # created_on：时间排序， downloads：下载次数排序; quotes: 引用次数排序
     course_second_category_id = params[:course_second_category_id] || 0 # 0: 为主目录， 其他为次目录id
     @user = current_user
-    @attachments = @course.attachments.by_course_second_category_id(course_second_category_id)
-                       .includes(attachment_group_settings: :course_group, author: [:user_extension, :course_members])
+    @attachments = course_second_category_id.to_i == 0 ? @course.attachments : @course.attachments.by_course_second_category_id(course_second_category_id)
+    @attachments = @attachments.includes(attachment_group_settings: :course_group, author: [:user_extension, :course_members])
                        .ordered(sort: sort.to_i, sort_type: sort_type.strip)
 
     get_category(@course, course_second_category_id)

app/helpers/courses_helper.rb

@@ -194,7 +194,7 @@ module CoursesHelper
 
   # 获取课堂的资源数
   def get_attachment_count(course, category_id)
-    course.attachments.where(course_second_category_id: category_id).size
+    category_id.to_i == 0 ? course.attachments.size : course.attachments.where(course_second_category_id: category_id).size
   end
 
   # 获取课堂的作业数

app/services/project_packages/win_bidding_service.rb

@@ -1,14 +1,16 @@
 class ProjectPackages::WinBiddingService < ApplicationService
   Error = Class.new(StandardError)
 
-  attr_reader :package, :params
+  attr_reader :package, :user, :params
 
-  def initialize(package, params)
+  def initialize(package, user, params)
     @package = package
+    @user    = user
     @params  = params
   end
 
   def call
+    raise Error, '没有权限' unless package.creator_id == user.id || user.admin_or_business?
     raise Error, '竞标报名还未结束' unless package.bidding_end?
     raise Error, '该状态下不能选择中标者' unless package.may_finish_bidding?
 

app/views/libraries/show.json.jbuilder

@@ -10,6 +10,7 @@ json.created_at library.display_created_at
 # 创建者
 json.creator do
   json.partial! 'users/user_simple', user: library.user
+  json.school_name library.user.school_name
 end
 
 # 封面

app/views/users/project_packages/index.json.jbuilder

@@ -16,5 +16,11 @@ json.project_packages do
 
     json.deadline_at package.display_deadline_at
     json.published_at package.display_published_at
+
+    json.operation do
+      can_manage = current_user&.id == observed_user.id || current_user&.admin_or_business?
+      json.can_edit can_manage && package.editable?
+      json.can_delete can_manage && package.deletable?
+    end
   end
 end

public/react/package.json

@@ -72,6 +72,7 @@
     "react-infinite-scroller": "^1.2.4",
     "react-loadable": "^5.3.1",
     "react-monaco-editor": "^0.25.1",
+    "react-player": "^1.11.1",
     "react-redux": "5.0.7",
     "react-router": "^4.2.0",
     "react-router-dom": "^4.2.2",

public/react/src/common/components/media/Clappr.js

@@ -1,5 +1,6 @@
 import React,{ Component } from "react";
 import { getUrl2 } from "educoder";
+import ReactPlayer from 'react-player'
 
 const $ = window.$
 let _url_origin = getUrl2()
@@ -15,9 +16,12 @@ class Clappr extends Component{
   }
   
   componentDidMount() {
+    return;
+    
     const source = this.props.source || "http://your.video/here.mp4"
     const { id, type } = this.props
     const _id = `#_player${id}`
+
     if (!window['Clappr'] && window['ClapprLoading'] == true) {
       setTimeout(() => {
         this.componentDidMount()
@@ -26,6 +30,7 @@ class Clappr extends Component{
     }
     // && window['clappr-playback-rate-plugin']
     if (window['Clappr'] ) {
+      // https://github.com/clappr/clappr/issues/1839
       // http://clappr.github.io/classes/Player.html#method_mute
         this['player'+id] = new window.Clappr.Player({
             source: source, parentId: _id,
@@ -83,12 +88,14 @@ class Clappr extends Component{
     const _id = `_player${id}`
     return(
       <React.Fragment>
-        <style>{`
+        {/* https://github.com/CookPete/react-player/issues/686 */}
+        <ReactPlayer url={source} playing={false} controls={true} width={400} height={ type == 'mp3' ? 55 : 290}/>
+        {/* <style>{`
             .playback_rate {
                 margin-right: 16px;
             }
         `}</style>
-        <div id={_id} className={className + ' ' + type}></div>
+        <div id={_id} className={className + ' ' + type}></div> */}
       </React.Fragment>
     )
   }

public/react/src/context/EffectDisplayContent.js

@@ -18,7 +18,7 @@ class EffectDisplayContent extends Component {
                     .effectDisplay .content>div {
                         flex: 1
                     }
-                    .effectDisplay .clappr {
+                    .effectDisplay .clappr, .effectDisplay .contentWrap {
                         display: flex;
                         justify-content: center;
                     }
@@ -32,13 +32,13 @@ class EffectDisplayContent extends Component {
                     {content3 && <p className="content_title edu-txt-center fl font-18  mr03precent">预期输出{typeName}</p>}
                 </div>
                 <div className="clearfix df content" >
-                    {content1 && <div className="fl  mr03precent pt10 mb50">
+                    {content1 && <div className="fl  mr03precent pt10 mb50 contentWrap">
                         {content1}
                     </div>}
-                    {content2 && <div className="fl  mr03precent pt10 mb50">
+                    {content2 && <div className="fl  mr03precent pt10 mb50 contentWrap">
                         {content2}
                     </div>}
-                    {content3 && <div className="fl  mr03precent pt10 mb50">
+                    {content3 && <div className="fl  mr03precent pt10 mb50 contentWrap">
                         {content3}
                     </div>}
                 </div>

public/react/src/modules/page/MainContentContainer.js

@@ -368,17 +368,20 @@ class MainContentContainer extends Component {
 	}
 
 	componentDidMount() {
-
-
-		window.$(window.documents).bind("submitChoose",function(){
-
-		    alert("hello world!");
-
-		});
-
-
-
+		// if (this.binded == true) {
+		// 	return;
+		// } else {
+		// 	this.binded = true
+		// 	window.$(window).unload( ()=>{
+		// 		alert(111)
+		// 		var fileUpdatePromise = this.doFileUpdateRequest(true)
+		// 	});
+		// }
 	}
+	componentWillUnmount() {
+		// window.$(window).off( "unload" )
+	}
+	
 
 	doFileUpdateRequestOnCodeMirrorBlur = () => {
 		var fileUpdatePromise = this.doFileUpdateRequest(true)