DG IZ added an error message on request delete
This commit is contained in:
parent
4a36df29e5
commit
33ed838b79
2 changed files with 10 additions and 4 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Reference in a new issue