m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_unstable
杨树明 6 years ago
parent 1040d1fc55 40fd534f07
commit fe6a0703a6
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File

44
app/controllers/attachments_controller.rb
Unescape View File

@ -162,28 +162,30 @@ class AttachmentsController < ApplicationController
def attachment_candown def attachment_candown
unless current_user.admin? || current_user.business? unless current_user.admin? || current_user.business?
candown = true candown = true
if @file.container && current_user.logged? unless params[:type] == 'history'
# 课堂资源、作业、毕设相关资源的权限判断 if @file.container && current_user.logged?
if @file.container.is_a?(Course) # 课堂资源、作业、毕设相关资源的权限判断
course = @file.container if @file.container.is_a?(Course)
candown = current_user.member_of_course?(course) || @file.is_public == 1 course = @file.container
elsif @file.container.is_a?(HomeworkCommon) || @file.container.is_a?(GraduationTask) || @file.container.is_a?(GraduationTopic) candown = current_user.member_of_course?(course) || @file.is_public == 1
course = @file.container&.course elsif @file.container.is_a?(HomeworkCommon) || @file.container.is_a?(GraduationTask) || @file.container.is_a?(GraduationTopic)
candown = current_user.member_of_course?(course) course = @file.container&.course
elsif @file.container.is_a?(StudentWork) candown = current_user.member_of_course?(course)
course = @file.container&.homework_common&.course elsif @file.container.is_a?(StudentWork)
candown = current_user.member_of_course?(course) course = @file.container&.homework_common&.course
elsif @file.container.is_a?(StudentWorksScore) candown = current_user.member_of_course?(course)
course = @file.container&.student_work&.homework_common&.course elsif @file.container.is_a?(StudentWorksScore)
candown = current_user.member_of_course?(course) course = @file.container&.student_work&.homework_common&.course
elsif @file.container.is_a?(GraduationWork) candown = current_user.member_of_course?(course)
course = @file.container&.graduation_task&.course elsif @file.container.is_a?(GraduationWork)
candown = current_user.member_of_course?(course) course = @file.container&.graduation_task&.course
elsif @file.container.is_a?(GraduationWorkScore) candown = current_user.member_of_course?(course)
course = @file.container&.graduation_work&.graduation_task&.course elsif @file.container.is_a?(GraduationWorkScore)
candown = current_user.member_of_course?(course) course = @file.container&.graduation_work&.graduation_task&.course
candown = current_user.member_of_course?(course)
end
tip_exception(403, "您没有权限进入") if course.present? && !candown
end end
tip_exception(403, "您没有权限进入") if course.present? && !candown
end end
end end
end end

4
public/react/src/modules/courses/Resource/Fileslistitem.js
Unescape View File

@ -42,7 +42,7 @@ class Fileslistitem extends Component{
//预览pdf //预览pdf
axios({ axios({
method:'get', method:'get',
url:result.data.url, url:"http:"+window.location.host+result.data.url,
responseType: 'arraybuffer', responseType: 'arraybuffer',
}).then((result)=>{ }).then((result)=>{
var binaryData = []; var binaryData = [];
@ -53,7 +53,7 @@ class Fileslistitem extends Component{
}else{ }else{
let link = document.createElement('a'); let link = document.createElement('a');
document.body.appendChild(link); document.body.appendChild(link);
link.href = "/api"+result.data.url; link.href = result.data.url;
link.download = result.data.title; link.download = result.data.title;
//兼容火狐浏览器 //兼容火狐浏览器
let evt = document.createEvent("MouseEvents"); let evt = document.createEvent("MouseEvents");

6
public/react/src/modules/courses/coursesPublic/Showoldfiles.js
Unescape View File

@ -45,7 +45,7 @@ class Showoldfiles extends Component{
showfiless=(url)=>{ showfiless=(url)=>{
axios({ axios({
method:'get', method:'get',
url:url, url:"http:"+window.location.host+url,
responseType: 'arraybuffer', responseType: 'arraybuffer',
}).then((result)=>{ }).then((result)=>{
var binaryData = []; var binaryData = [];
@ -188,7 +188,7 @@ class Showoldfiles extends Component{
<li className="fl fontlefts"> <li className="fl fontlefts">
{allfiles.is_pdf===false? {allfiles.is_pdf===false?
<a className={"isabox"} href={"/api"+allfiles.url} >{allfiles.title}</a>: <a className={"isabox"} href={allfiles.url} >{allfiles.title}</a>:
<a className={"isabox"} onClick={()=>this.showfiless(allfiles.url)} >{allfiles.title}</a> <a className={"isabox"} onClick={()=>this.showfiless(allfiles.url)} >{allfiles.title}</a>
} }
<span className={"newcolor-orange fl"}>当前版本</span> <span className={"newcolor-orange fl"}>当前版本</span>
@ -208,7 +208,7 @@ class Showoldfiles extends Component{
<li className="fl fontlefts"> <li className="fl fontlefts">
{item.is_pdf===false? {item.is_pdf===false?
<a className={"isabox"} href={"/api"+item.url}>{item.title}</a>: <a className={"isabox"} href={item.url}>{item.title}</a>:
<a className={"isabox"} onClick={()=>this.showfiless(item.url)} >{item.title}</a> <a className={"isabox"} onClick={()=>this.showfiless(item.url)} >{item.title}</a>
} }
</li> </li>

Write Preview
Loading…
Cancel
Save