From 33ed838b79d0f6356d300e89f0e6e01c35005206 Mon Sep 17 00:00:00 2001
From: ilya <ilya@laptop.(none)>
Date: Mon, 16 Aug 2010 15:08:05 -0700
Subject: [PATCH] DG IZ added an error message on request delete
---
app/controllers/requests_controller.rb | 12 ++++++++----
app/views/requests/_request.html.haml | 2 ++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/app/controllers/requests_controller.rb b/app/controllers/requests_controller.rb
index fd6cfc74fd..22f133e1da 100644
--- a/app/controllers/requests_controller.rb
+++ b/app/controllers/requests_controller.rb
@@ -8,10 +8,14 @@ class RequestsController < ApplicationController
def destroy
if params[:accept]
- @friend = current_user.accept_and_respond( params[:id], params[:group_id])
-
- flash[:notice] = "you are now friends"
- redirect_to root_url
+
+ if params[:group_id]
+ @friend = current_user.accept_and_respond( params[:id], params[:group_id])
+
+ flash[:notice] = "you are now friends"
+ redirect_to root_url
+ else
+ flash[:error] = "please select a group!"
else
current_user.ignore_friend_request params[:id]
flash[:notice] = "ignored friend request"
diff --git a/app/views/requests/_request.html.haml b/app/views/requests/_request.html.haml
index e29b45bc55..3cd2c398f7 100644
--- a/app/views/requests/_request.html.haml
+++ b/app/views/requests/_request.html.haml
@@ -14,6 +14,8 @@
%ul.request_buttons
%select{ :class => "group_selector", :style=>"display:inline;"}
+ %option Add to group
+ %option
- for group in current_user.groups
%option{:value => group.id}= group.name
%li.accept= link_to 'Accept', request_path(request, :accept => true), :method => :delete, :class => "button"
--
GitLab