ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-13 05:10:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed an error with proposal update messages not getting sent properly

Browse source
This commit is contained in:
Absurdon 2017-10-15 14:14:26 +02:00
parent 7c4a7b9c69
commit fe60bcea49
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/match_proposals_controller.rb
View file

@ -60,7 +60,7 @@ class MatchProposalsController < ApplicationController
} }
render(json: rjson, status: :forbidden) && return render(json: rjson, status: :forbidden) && return
end end
new_status = params[:match_proposal][:status] new_status = params[:match_proposal][:status].to_i
curr_status = proposal.status curr_status = proposal.status
status_updated = curr_status != new_status status_updated = curr_status != new_status
proposal.status = new_status proposal.status = new_status
@ -70,10 +70,10 @@ class MatchProposalsController < ApplicationController
msg = Message.new msg = Message.new
msg.sender_type = 'System' msg.sender_type = 'System'
msg.recipient_type = 'Team' msg.recipient_type = 'Team'
msg.title = 'New Scheduling Proposal' msg.title = 'Scheduling Proposal Update'
recipient = @match.get_opposing_team(cuser.team) recipient = @match.get_opposing_team(cuser.team)
msg.recipient = recipient msg.recipient = recipient
msg.text = message_text(new_status) msg.text = message_text(new_status, recipient)
msg.save if msg.text msg.save if msg.text
end end
@ -94,19 +94,19 @@ private
@match = Match.find params[:match_id] @match = Match.find params[:match_id]
end end
def message_text(new_status) def message_text(new_status, recipient)
case new_status case new_status
when MatchProposal::STATUS_CONFIRMED when MatchProposal::STATUS_CONFIRMED
"A scheduling proposal for your match against #{recipient.name} was confirmed!.\n" \ "A scheduling proposal for your match against [b]#{recipient.name}[/b] was confirmed!.\n" \
"Find it [url=#{match_proposals_path(@match)}]here[/url]" "Find it [url=#{match_proposals_path(@match)}]here[/url]"
when MatchProposal::STATUS_REJECTED when MatchProposal::STATUS_REJECTED
"A scheduling proposal for your match against #{recipient.name} was rejected!.\n" \ "A scheduling proposal for your match against [b]#{recipient.name}[/b] was rejected!.\n" \
"Find it [url=#{match_proposals_path(@match)}]here[/url]" "Find it [url=#{match_proposals_path(@match)}]here[/url]"
when MatchProposal::STATUS_REVOKED when MatchProposal::STATUS_REVOKED
"A scheduling proposal for your match against #{recipient.name} was revoked!.\n" \ "A scheduling proposal for your match against [b]#{recipient.name}[/b] was revoked!.\n" \
"Find it [url=#{match_proposals_path(@match)}]here[/url]" "Find it [url=#{match_proposals_path(@match)}]here[/url]"
when MatchProposal::STATUS_DELAYED when MatchProposal::STATUS_DELAYED
"Delaying for your match against #{recipient.name} was permitted!.\n" \ "Delaying for your match against [b]#{recipient.name}[/b] was permitted!.\n" \
"Schedule a new time as soon as possible [url=#{match_proposals_path(@match)}]here[/url]" "Schedule a new time as soon as possible [url=#{match_proposals_path(@match)}]here[/url]"
else else
false # Should not happen as transition to any other state is not allowed false # Should not happen as transition to any other state is not allowed