Skip to content
Extraits de code Groupes Projets
Valider 33ed838b rédigé par ilya's avatar ilya
Parcourir les fichiers

DG IZ added an error message on request delete

parent 4a36df29
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -8,10 +8,14 @@ class RequestsController < ApplicationController ...@@ -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])
if params[:group_id]
flash[:notice] = "you are now friends" @friend = current_user.accept_and_respond( params[:id], params[:group_id])
redirect_to root_url
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"
......
...@@ -14,6 +14,8 @@ ...@@ -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"
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter