ensl/ensl.org
0
0
Fork 0
mirror of https://github.com/ENSL/ensl.org.git synced 2025-01-29 20:50:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed issue#97

Browse source
This commit is contained in:
Absurdon 2017-03-03 14:09:14 +01:00
parent 4a863ee5f4
commit 888f7ad9e2
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/teamers_controller.rb
View file

@ -1,11 +1,13 @@
class TeamersController < ApplicationController
def create
@old_application = (cuser.teamers.joining.count == 0) ? nil : cuser.teamers.joining.first
@teamer = Teamer.new params[:teamer]
raise AccessError unless @teamer.can_create? cuser, params[:teamer]
@teamer.user = cuser unless cuser.admin?
if @teamer.save
flash[:notice] = t(:applying_team) + @teamer.team.to_s
@old_application && @old_application.destroy
else
flash[:error] = @teamer.errors.full_messages.to_s
end

19
app/views/teams/show.html.erb
View file

@ -10,18 +10,19 @@
<% end %>
<% if cuser && cuser.teamers %>
<% if cuser.teamers.joining.count == 0 && @team.active %>
<%= form_for @teamer do |f| %>
<%= f.error_messages %>
<%= f.hidden_field :user_id, :value => cuser.id %>
<%= f.hidden_field :team_id, :value => @team.id %>
<%= form_for @teamer do |f| %>
<%= f.error_messages %>
<%= f.hidden_field :user_id, :value => cuser.id %>
<%= f.hidden_field :team_id, :value => @team.id %>
<% if cuser.teamers.joining.count == 0 && @team.active %>
<div class="controls inline">
<%= f.submit "Request To Join", class: 'button' %>
<%= f.submit "Request To Join", class: 'button' %>
</div>
<% elsif cuser.teamers.joining.first.team != @team %>
<div class="controls inline">
<%= f.submit "Request To Join", class: 'button', data: { confirm: "You have already requested to join #{cuser.teamers.joining.first.team}. Do you want to request to join #{@team} instead?" } %>
</div>
<% end %>
<% elsif cuser.teamers.joining.first.team != @team %>
<%= link_to 'Request To Join', edit_teamer_path("teamer" => cuser.teamers.joining.first), method: :get,confirm: "You have already requested to join #{cuser.teamers.joining.first.team}. Do you want to request to join #{@team} instead?", class: 'button' %>
<% end %>
<% end %>