DG IZ added an error message on request delete

This commit is contained in:
ilya 2010-08-16 15:08:05 -07:00
parent 4a36df29e5
commit 33ed838b79
2 changed files with 10 additions and 4 deletions

View file

@ -8,10 +8,14 @@ class RequestsController < ApplicationController
def destroy def destroy
if params[:accept] if params[:accept]
@friend = current_user.accept_and_respond( params[:id], params[:group_id])
flash[:notice] = "you are now friends" if params[:group_id]
redirect_to root_url @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 else
current_user.ignore_friend_request params[:id] current_user.ignore_friend_request params[:id]
flash[:notice] = "ignored friend request" flash[:notice] = "ignored friend request"

View file

@ -14,6 +14,8 @@
%ul.request_buttons %ul.request_buttons
%select{ :class => "group_selector", :style=>"display:inline;"} %select{ :class => "group_selector", :style=>"display:inline;"}
%option Add to group
%option
- for group in current_user.groups - for group in current_user.groups
%option{:value => group.id}= group.name %option{:value => group.id}= group.name
%li.accept= link_to 'Accept', request_path(request, :accept => true), :method => :delete, :class => "button" %li.accept= link_to 'Accept', request_path(request, :accept => true), :method => :delete, :class => "button"