diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 2bcc8d8f6..9d3afc80c 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -20,9 +20,8 @@ class BoardsController < ApplicationController new_board.parent_id = board.try(:id) new_board.position = board.children.count + 1 new_board.save! + render :json => {category_id: new_board.id, status: 0, message: "添加成功"} end - - normal_status(0, "添加成功") end # 子目录的拖动 diff --git a/app/controllers/course_groups_controller.rb b/app/controllers/course_groups_controller.rb index bfdb959b4..42a070734 100644 --- a/app/controllers/course_groups_controller.rb +++ b/app/controllers/course_groups_controller.rb @@ -9,8 +9,8 @@ class CourseGroupsController < ApplicationController if @course.course_groups.where(name: params[:name]).count > 0 normal_status(-1, "已存在同名分班") else - @course.course_groups.create!(name: params[:name], position: @course.course_groups.count + 1) - normal_status(0, "创建成功") + course_group = @course.course_groups.create!(name: params[:name], position: @course.course_groups.count + 1) + render :json => {group_id: course_group.id, status: 0, message: "创建成功"} end end diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index ee8e632b5..d71b72618 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -722,7 +722,7 @@ class ExercisesController < ApplicationController ex_status = exercise.exercise_status #则为试卷的状态 else ex_status = @course.course_groups.where(id: params[:group_ids]).size != - exercise.exercise_group_settings.where("course_group_id", params[:group_ids]).exercise_group_published.size ? 1 : 0 + exercise.exercise_group_settings.where(course_group_id: params[:group_ids]).exercise_group_published.size ? 1 : 0 end if ex_status == 1 #如果试卷存在已发布的，或者是已截止的，那么则直接跳过 g_course = group_ids #表示是否传入分班参数,如果传入分班的参数，那么试卷的统一设置需修改 diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb index b4da1256e..cb507fdcb 100644 --- a/app/controllers/polls_controller.rb +++ b/app/controllers/polls_controller.rb @@ -280,7 +280,7 @@ class PollsController < ApplicationController pl_status = poll.polls_status #则为试卷的状态 else pl_status = @course.course_groups.where(id: group_ids).size != - poll.poll_group_settings.where("course_group_id", group_ids).poll_group_published.size ? 1 : 0 #立即发布针对分组设置的全部未发布的班级才生效 + poll.poll_group_settings.where(course_group_id: group_ids).poll_group_published.size ? 1 : 0 #立即发布针对分组设置的全部未发布的班级才生效 end if pl_status == 1 #如果问卷存在已发布的，或者是已截止的，那么则直接跳过 g_course = group_ids #表示是否传入分班参数,如果传入分班的参数，那么poll的统一设置需修改 diff --git a/public/react/src/modules/courses/busyWork/UseBank.js b/public/react/src/modules/courses/busyWork/UseBank.js index 951408014..ed47eb2d0 100644 --- a/public/react/src/modules/courses/busyWork/UseBank.js +++ b/public/react/src/modules/courses/busyWork/UseBank.js @@ -35,6 +35,8 @@ class UseBank extends Component{ } } componentDidMount() { + console.log("UseBank"); + console.log(this.props); } onCheckBoxChange = (checkBoxValues) => { @@ -182,6 +184,9 @@ class UseBank extends Component{ let { flag, nav_my, loading, hasMore, object_list, search, checkBoxValues,isChecked,page,is_teacher }=this.state let { object_type }=this.props; const antIcon = ; + console.log("题库选用2222"); + console.log("UseBank"); + console.log(this.props); return( -
-
- {/* /!*{}}>
- {/* /!*{jobsettingsdata.data.description}*!/*/} - {/* */} - - {/*
*/} - {/*

*/} - {/* /!*{ChallengesDataList === undefined ? "" :ChallengesDataList.description===null?""*!/*/} - {/* */} - {/* /!*}*!/*/} - {/*

*/} - - {/*
*/} - - } - -
-
作业说明:
- { - this.props.isAdmin() && this.props.isAdmin() === true ? - - (Showupdateinstructions && Showupdateinstructions === true ? "" : - this.jobdescriptiondisplaybj()}> - ) : "" - } - -
+ {/*{jobsettingsdata === undefined || jobsettingsdata.data.description === null ?
无
:*/} + {/*
*/} + {/* */} + {/* */} + {/*
*/} + {/*
*/} + + {/*
*/} + {/* */} + {/*
}*/} + + {/*
*/} + {/*
作业说明:
*/} + {/*{*/} + {/* this.props.isAdmin() && this.props.isAdmin() === true ?*/} + + {/* (Showupdateinstructions && Showupdateinstructions === true ? "" :*/} + {/* this.jobdescriptiondisplaybj()}>*/} + {/* ) : ""*/} + {/*}*/} + + {/*
*/}
- {Showupdateinstructions && Showupdateinstructions === true ? + {this.props.Showupdateinstructions && this.props.Showupdateinstructions === true ?
- this.ReleaseNotes(explanations)} + NOReleaseNotes={()=>this.NOReleaseNotes()} description={jobsettingsdata === undefined ? "" : jobsettingsdata === null ? "" : jobsettingsdata === "null" ? "" : jobsettingsdata.data.explanation === undefined ? "" : jobsettingsdata.data.explanation === null ? "" : jobsettingsdata.data.explanation}>
: -
- {jobsettingsdata === undefined ? "无" : jobsettingsdata === null ? "无" : jobsettingsdata === "null" ? "无" : - jobsettingsdata.data.explanation === undefined ? "无" : jobsettingsdata.data.explanation === null ? "无" : +
+ {jobsettingsdata === undefined ? 暂无~ : jobsettingsdata === null ? 暂无~ : jobsettingsdata === "null" ? 暂无~ : + jobsettingsdata.data.explanation === undefined ? 暂无~ : jobsettingsdata.data.explanation === null ? 暂无~ :
} diff --git a/public/react/src/modules/forums/RightMyPublish.js b/public/react/src/modules/forums/RightMyPublish.js index fc101ae30..69ce9912c 100644 --- a/public/react/src/modules/forums/RightMyPublish.js +++ b/public/react/src/modules/forums/RightMyPublish.js @@ -1,76 +1,75 @@ -import React, { Component } from 'react'; -import { Redirect } from 'react-router'; - -import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; - -import PropTypes from 'prop-types'; - -import classNames from 'classnames' - -import { getImageUrl, toPath, LinkAfterLogin } from 'educoder' - -import match_adImg from '../../images/ad/match_ad.jpg' -const $ = window.$ - -class RightMyPublish extends Component { - constructor(props) { - super(props) - - this.state = { - - } - } - - handleKeyPress = (event) => { - if(event.type !== 'keypress' || event.key == 'Enter'){ - this.props.setSearchValue( this.props.searchValue, true); - // $(window).trigger('setSearchValue', $('#shixun_search_input').val()) - } - } - handleInput = (event) => { - this.props.setSearchValue(event.target.value); - } - - render() { - const { match, history, currentPage, my_memos_count, setSearchValue, searchValue } = this.props - - return ( - -
- {/*
-
- - - × -
- -
*/} - -
- - - - - - -
- 发布话题 - {/*

- 我的发布
- {my_memos_count} -

*/} -
- -
- -
- - ); - } -} - -export default RightMyPublish; +import React, { Component } from 'react'; +import { Redirect } from 'react-router'; + +import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom"; + +import PropTypes from 'prop-types'; + +import classNames from 'classnames' + +import { getImageUrl, toPath, LinkAfterLogin } from 'educoder' + +import match_adImg from '../../images/ad/match_ad.jpg' +const $ = window.$ + +class RightMyPublish extends Component { + constructor(props) { + super(props) + + this.state = { + + } + } + + handleKeyPress = (event) => { + if(event.type !== 'keypress' || event.key == 'Enter'){ + this.props.setSearchValue( this.props.searchValue, true); + // $(window).trigger('setSearchValue', $('#shixun_search_input').val()) + } + } + handleInput = (event) => { + this.props.setSearchValue(event.target.value); + } + + render() { + const { match, history, currentPage, my_memos_count, setSearchValue, searchValue } = this.props + + return ( + +
+ {/*
+
+ + + × +
+ +
*/} +
+ + + + + + +
+ 发布话题 + {/*

+ 我的发布
+ {my_memos_count} +

*/} +
+ +
+ +
+ + ); + } +} + +export default RightMyPublish; diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 29b6baa04..543c71c69 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -955,12 +955,9 @@ submittojoinclass=(value)=>{ {/*众包创新*/} {/**/} {/*
  • 交流问答
    • */} - {/*工程认证*/} - - - +
  • 工程认证
  • 0 ? 'block' : 'none'}}>