ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-01-03 18:35:09 +01:00
Code Issues Releases Wiki Activity

Merge pull request #66 from ascribe/only-fetch-ratings-if-authorized

Browse Source 
Avoid unauthorized attempts at fetching ratings if user isn't an admin, judge, or jury
This commit is contained in:
Brett Sun 2016-01-19 16:05:22 +01:00
commit 77c88cbd0f
3 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_forms/form.js
View File

@ -208,7 +208,7 @@ let Form = React.createClass({
if (this.state.submitted){ if (this.state.submitted){
return this.props.spinner; return this.props.spinner;
} }
if (this.props.buttons){ if ('buttons' in this.props) {
return this.props.buttons; return this.props.buttons;
} }
let buttons = null; let buttons = null;

8
js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js
View File

@ -197,7 +197,7 @@ const PRRegisterPieceForm = React.createClass({
return ( return (
<div className="register-piece--form"> <div className="register-piece--form">
<Form <Form
buttons={{}} buttons={null}
className="ascribe-form-bordered" className="ascribe-form-bordered"
ref="registerPieceForm"> ref="registerPieceForm">
<Property <Property
@ -234,7 +234,7 @@ const PRRegisterPieceForm = React.createClass({
</Property> </Property>
</Form> </Form>
<Form <Form
buttons={{}} buttons={null}
className="ascribe-form-bordered" className="ascribe-form-bordered"
ref="additionalDataForm"> ref="additionalDataForm">
<Property <Property
@ -286,7 +286,7 @@ const PRRegisterPieceForm = React.createClass({
</Property> </Property>
</Form> </Form>
<Form <Form
buttons={{}} buttons={null}
className="ascribe-form-bordered" className="ascribe-form-bordered"
ref="uploadersForm"> ref="uploadersForm">
<Property <Property
@ -390,7 +390,7 @@ const PRRegisterPieceForm = React.createClass({
</Property> </Property>
</Form> </Form>
<Form <Form
buttons={{}} buttons={null}
className="ascribe-form-bordered"> className="ascribe-form-bordered">
<Property <Property
name="terms" name="terms"

43
js/components/whitelabel/prize/simple_prize/components/ascribe_detail/prize_piece_container.js
View File

@ -187,8 +187,8 @@ let PrizePieceContainer = React.createClass({
let NavigationHeader = React.createClass({ let NavigationHeader = React.createClass({
propTypes: { propTypes: {
piece: React.PropTypes.object, currentUser: React.PropTypes.object.isRequired,
currentUser: React.PropTypes.object piece: React.PropTypes.object.isRequired
}, },
render() { render() {
@ -224,9 +224,10 @@ let NavigationHeader = React.createClass({
let PrizePieceRatings = React.createClass({ let PrizePieceRatings = React.createClass({
propTypes: { propTypes: {
loadPiece: React.PropTypes.func, currentUser: React.PropTypes.object.isRequired,
piece: React.PropTypes.object, loadPiece: React.PropTypes.func.isRequired,
currentUser: React.PropTypes.object, piece: React.PropTypes.object.isRequired,
selectedPrizeActionButton: React.PropTypes.func selectedPrizeActionButton: React.PropTypes.func
}, },
@ -239,12 +240,18 @@ let PrizePieceRatings = React.createClass({
}, },
componentDidMount() { componentDidMount() {
PieceListStore.listen(this.onChange);
PrizeStore.listen(this.onChange);
PrizeRatingStore.listen(this.onChange); PrizeRatingStore.listen(this.onChange);
PrizeStore.listen(this.onChange);
PieceListStore.listen(this.onChange);
PrizeActions.fetchPrize(); PrizeActions.fetchPrize();
this.fetchPrizeRatings(); this.fetchRatingsIfAuthorized();
},
componentWillReceiveProps(nextProps) {
if (nextProps.currentUser.email !== this.props.currentUser.email) {
this.fetchRatingsIfAuthorized();
}
}, },
componentWillUnmount() { componentWillUnmount() {
@ -259,7 +266,7 @@ let PrizePieceRatings = React.createClass({
// with the problem. // with the problem.
onChange(state) { onChange(state) {
if (state.prize && state.prize.active_round != this.state.prize.active_round) { if (state.prize && state.prize.active_round != this.state.prize.active_round) {
this.fetchPrizeRatings(state); this.fetchRatingsIfAuthorized(state);
} }
this.setState(state); this.setState(state);
@ -274,9 +281,19 @@ let PrizePieceRatings = React.createClass({
} }
}, },
fetchPrizeRatings(state = this.state) { fetchRatingsIfAuthorized(state = this.state) {
PrizeRatingActions.fetchOne(this.props.piece.id, state.prize.active_round); const {
PrizeRatingActions.fetchAverage(this.props.piece.id, state.prize.active_round); currentUser: {
is_admin: isAdmin,
is_judge: isJudge,
is_jury: isJury
},
piece: { id: pieceId } } = this.props;
if (state.prize && 'active_round' in state.prize && (isAdmin || isJudge || isJury)) {
PrizeRatingActions.fetchOne(pieceId, state.prize.active_round);
PrizeRatingActions.fetchAverage(pieceId, state.prize.active_round);
}
}, },
onRatingClick(event, args) { onRatingClick(event, args) {
@ -425,7 +442,7 @@ let PrizePieceRatings = React.createClass({
let PrizePieceDetails = React.createClass({ let PrizePieceDetails = React.createClass({
propTypes: { propTypes: {
piece: React.PropTypes.object piece: React.PropTypes.object.isRequired
}, },
render() { render() {