ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-02-28 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

reworked match proposal update to allow stricter controll

Browse source
This commit is contained in:
Absurdon 2017-06-30 14:03:46 +02:00
parent 29a6a83887
commit dfbe4686ff
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/match_proposals_controller.rb
View file

@ -25,10 +25,12 @@ class MatchProposalsController < ApplicationController
end
def update
raise AccessError unless @match.can_make_proposal?(cuser)
@proposal = MatchProposal.find(params[:id])
raise AccessError unless @proposal.can_update?(cuser, params[:match_proposal])
@proposal.status = params[:match_proposal][:status]
if @proposal.save
# TODO: rework messages
# TODO: make it so only one proposal can be confirmed for a match at any given time
action = case @proposal.status
when MatchProposal::STATUS_CONFIRMED
"Confirmed Proposal for #{Time.use_zone(view_context.timezone_offset) { @proposal.proposed_time.strftime('%d %B %y %H:%M %Z') }}"

13
app/models/match_proposal.rb
View file

@ -22,8 +22,17 @@ class MatchProposal < ActiveRecord::Base
cuser && match && match.can_make_proposal?(cuser)
end
def can_update? cuser
cuser && match && match.can_make_proposal?(cuser)
def can_update? cuser, params = {}
return false unless cuser && match && match.can_make_proposal?(cuser)
if params.key?(:status) && (status.to_s != params[:status]) &&
(STATUS_REVOKED.to_s != params[:status])
return false unless (team != cuser.team)
return false if (STATUS_CONFIRMED.to_s == params[:status]) && (proposed_time < 20.minutes.from_now)
# TODO: update to usefull timelimit
# TODO: define rules for revoking; timelimit, access
end
true
end
def can_destroy?