@@ -134,14 +134,14 @@ class GraduateTopicDetail extends Component{
取消选题
}
{
- isAdmin && 编辑
+ isAdmin && 编辑
}
{
tab && tab==1&&
-
+
{
tableData && tableData.users_count>tablePageSize &&
@@ -161,4 +161,4 @@ class GraduateTopicDetail extends Component{
)
}
}
-export default GraduateTopicDetail;
\ No newline at end of file
+export default GraduateTopicDetail;
diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js
index b3fd113da..6d637552d 100644
--- a/public/react/src/modules/courses/new/Goldsubject.js
+++ b/public/react/src/modules/courses/new/Goldsubject.js
@@ -720,7 +720,7 @@ class Goldsubject extends Component {
{/*
{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}*/}
{/**/}
- {Whethertocreateanewclassroom===true?"教学课堂":name}
>
{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}
diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js
index 3b50695e8..a3cbba89b 100644
--- a/public/react/src/modules/courses/poll/PollNew.js
+++ b/public/react/src/modules/courses/poll/PollNew.js
@@ -362,7 +362,7 @@ class PollNew extends Component {
pollid: result.data.data.id,
Newedit: false,
})
- this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
+ this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
}
})
}
@@ -2590,7 +2590,7 @@ class PollNew extends Component {
if (result.data.status === 0) {
// console.log("更新题目成功")
// this.props.showNotification("保存成功");
- this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${pollid}/detail?tab=2`)
+ this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/polls/${pollid}/detail?tab=2`)
}
} catch (e) {
@@ -2766,7 +2766,7 @@ class PollNew extends Component {
//
// let courseId=this.props.match.params.coursesId;
// if(courseId===undefined){
- // this.props.history.push("/courses");
+ // this.props.history.push("/classrooms");
// }else{
// this.props.history.push(this.props.current_user.first_category_url);
// }
@@ -2833,10 +2833,10 @@ class PollNew extends Component {
{
this.props.match.params.news === "new"?
问卷
+ href={`/classrooms/${this.props.match.params.coursesId}/polls/${this.props.match.params.pollid}`}>问卷
:
问卷
+ href={`/classrooms/${this.props.match.params.coursesId}/polls/${left_banner_id}`}>问卷
}
>
@@ -2847,10 +2847,10 @@ class PollNew extends Component {
className="fl color-black summaryname mt5">{this.props.match.params.news === undefined ? "新建问卷" : this.props.match.params.news === "new" ? "新建问卷" : "编辑问卷"}
{
this.props.match.params.news === "new" ?
-
:
-
}
diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js
index ad68530e7..58aa916c4 100644
--- a/public/react/src/modules/courses/poll/PollNewQuestbank.js
+++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js
@@ -385,7 +385,7 @@ class PollNewQuestbank extends Component {
pollid: result.data.data.id,
Newedit: false,
})
- this.props.history.push(`/courses/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
+ this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/polls/${result.data.data.id}/detail?tab=2`)
}
})
}
@@ -4309,4 +4309,4 @@ export default PollNewQuestbank
{/* */
}
{/*}*/
-}
\ No newline at end of file
+}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index 28292d13b..5e4842574 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
@@ -138,7 +138,7 @@ class ShixunWorkReport extends Component {
gotohome=()=>{
let courseId=this.props.match.params.coursesId;
if(courseId===undefined){
- this.props.history.push("/courses");
+ this.props.history.push("/classrooms");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 74f2ed7a2..e32479735 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -974,7 +974,7 @@ class ShixunHomework extends Component{
gotohome=()=>{
let courseId=this.props.match.params.coursesId;
if(courseId===undefined){
- this.props.history.push("/courses");
+ this.props.history.push("/classrooms");
}else{
this.props.history.push(this.props.current_user.first_category_url);
}
@@ -1179,7 +1179,7 @@ class ShixunHomework extends Component{
{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
- 调整排序
+ 调整排序
:"":"":""}
diff --git a/public/react/src/modules/user/usersInfo/video/InfosVideo.css b/public/react/src/modules/user/usersInfo/video/InfosVideo.css
index a28f7cf5d..60813fb0c 100644
--- a/public/react/src/modules/user/usersInfo/video/InfosVideo.css
+++ b/public/react/src/modules/user/usersInfo/video/InfosVideo.css
@@ -68,9 +68,6 @@
}
-.videoInReviewItem .square-main {
- background: #EAEAEA;
-}
.videoItem .time {
color: #C0C4CC;
}
diff --git a/public/react/src/modules/user/usersInfo/video/InfosVideo.js b/public/react/src/modules/user/usersInfo/video/InfosVideo.js
index 1557b0686..05d726628 100644
--- a/public/react/src/modules/user/usersInfo/video/InfosVideo.js
+++ b/public/react/src/modules/user/usersInfo/video/InfosVideo.js
@@ -65,7 +65,8 @@ function InfoVideo(props) {
const videoEl = useRef(null);
const { showNotification, history } = props;
- const username = props.match.params.username
+ const username = props.match.params.username;
+ const { user } = props;
function toUpload() {
if (props.current_user.admin || (props.current_user.is_teacher && props.checkIfProfessionalCertification())) {
@@ -87,16 +88,15 @@ function InfoVideo(props) {
sort_direction: sorts[1],
//
}
+ }).then((response) => {
+ setLoading(false)
+ if (response.data.videos) {
+ setvideos(response.data.videos)
+ setCount(response.data.count)
+ }
+ }).catch(() => {
+ setLoading(false)
})
- .then((response) => {
- setLoading(false)
- if (response.data.videos) {
- setvideos(response.data.videos)
- setCount(response.data.count)
- }
- }).catch(() => {
- setLoading(false)
- })
}
function fetchReviewvideos() {
const fetchUrl = `/users/${username}/videos/review.json`
@@ -144,7 +144,8 @@ function InfoVideo(props) {
useEffect(() => {
if (videoModalObj.visible == false) {
// 关闭视频
- videoEl.current && videoEl.current.pause()
+ videoEl.current && videoEl.current.pause();
+ videoId = {};
if (_clipboard) {
_clipboard.destroy();
_clipboard = null;
@@ -184,9 +185,8 @@ function InfoVideo(props) {
videoId = {
videoId: item.id,
title: item.title,
- file_url: item.file_url,
+ file_url: item.play_url || item.file_url,
cover_url: item.cover_url
-
}
videoModalObj.setVisible(true)
}
@@ -218,6 +218,36 @@ function InfoVideo(props) {
}
+
+ function deleteVideo(item){
+ props.confirm({
+ content: '该视频将被删除，不可恢复',
+ subContent: '是否确认删除?',
+
+ onOk: () => {
+ const url = `/users/${user && user.login}/videos/${item.id}.json`;
+ axios.delete(url).then(result => {
+ if (result) {
+ props.showNotification(`视频删除成功!`);
+ if (pageObj.current === 1) {
+ if (categoryObj.category === 'all') {
+ fetchvideos()
+ } else {
+ fetchReviewvideos()
+ }
+ } else {
+ pageObj.onChange(1)
+ }
+ }
+ }).catch(error => {
+ console.log(error);
+ })
+ },
+ onCancel() {
+ console.log('Cancel');
+ },
+ });
+ }
function getCopyText(file_url, cover_url) {
return `
`
}
@@ -237,7 +267,7 @@ function InfoVideo(props) {
className="showVideoModal"
width={800 - 1}
>
-
+ {videoModalObj.visible &&
}
)
})
@@ -416,6 +446,7 @@ function InfoVideo(props) {
{...item}
key={item.id}
isReview={true}
+ deleteVideo={user && ((user.login === item.user_login) || user.admin) ? deleteVideo : undefined}
>
)
})
diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
index 6849db062..4e0ca8fb2 100644
--- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
+++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
@@ -79,9 +79,9 @@ function VideoInReviewItem (props) {
} {!vv || (vv && vv)===0?"":vv}
- { isReview != true &&
+
{
- moveVideo &&
+ isReview !== true && moveVideo &&
moveVideo(props)}
style={{ marginTop: '1px', display: 'inline-block'}}
@@ -98,7 +98,7 @@ function VideoInReviewItem (props) {
}
{
- operation &&
+ isReview !== true && operation &&
onEditVideo(props)}
style={{ marginTop: '1px', display: 'inline-block'}}
@@ -106,13 +106,13 @@ function VideoInReviewItem (props) {
}
{
- !link ?
+ isReview !== true && !link ?
:""
}
-
}
+