From 0ee03afe1da70c3622e13f5435d0385122c29c4e Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Mon, 16 Aug 2010 11:39:33 -0700
Subject: [PATCH] DG IZ selector box on request page
---
app/controllers/requests_controller.rb | 5 -----
app/views/requests/_request.html.haml | 14 +++++++++++---
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index 4caff37f48..5865aacafc 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 03ab427f3b..b44a27adb8 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"
--
GitLab