diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb index 4caff37f48433b6cbd0f4c2e47d4549ffc7305fa..5865aacafc80bb98b6c612940dfb1f20797ceda5 100644 --- a/app/controllers/requests_controller.rb +++ b/app/controllers/requests_controller.rb @@ -43,9 +43,4 @@ class RequestsController < ApplicationController end end - - - private - - end diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml index 03ab427f3b333a8990bee680e71b2f101ded5323..b44a27adb808fb1fcd589ea1d04a6c543125c2cb 100644 --- a/app/views/requests/_request.html.haml +++ b/app/views/requests/_request.html.haml @@ -3,6 +3,14 @@ %span.from = link_to "#{request.person.real_name}", '#' - %ul.request_buttons - %li= link_to 'Accept', request_path(request, :accept => true), :method => :delete - %li= link_to 'Ignore', request_path(request), :confirm => 'Are you sure?', :method => :delete + .request_buttons + = form_for request do |r| + = r.hidden_field(:accept, :accept, true) + %select{ :id => "request_group_id", :name => "request[group_id]"} + - for group in current_user.groups + %option{:value => group.id}= group.name + = r.submit_tag "Accept" + + = form_for request do |r| + = r.hidden_field(:accept, :accept, false) + = r.submit_tag "Ignore"