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

Testing ignore friend request on remote

parent 9b07c780
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
= javascript_include_tag 'group-edit.js' = javascript_include_tag 'group-edit.js'
- content_for :left_pane do - content_for :left_pane do
%h1{:id => 'group_title'} %h1
Requests Requests
%li.requests %li.requests
...@@ -14,6 +14,17 @@ ...@@ -14,6 +14,17 @@
.name .name
= request.person.real_name = request.person.real_name
%h1
Ignore/Remove
%li.remove
%ul
- for request in @remote_requests
%li.person{:id => request.person.id, :request_id => request.id}
= image_tag(request.person.profile.image_url(:thumb_small)) unless request.person.profile.image_url.nil?
.name
= request.person.real_name
%h1{:id => 'group_title'} %h1{:id => 'group_title'}
Relations Relations
......
...@@ -13,7 +13,8 @@ $(function() { ...@@ -13,7 +13,8 @@ $(function() {
$("li .person").draggable({ $("li .person").draggable({
revert: true revert: true
}); });
$(".group ul").droppable({ $(".group ul").droppable({
drop: function(event, ui) { drop: function(event, ui) {
if (ui.draggable[0].getAttribute('request_id') != null){ if (ui.draggable[0].getAttribute('request_id') != null){
...@@ -38,6 +39,21 @@ $(function() { ...@@ -38,6 +39,21 @@ $(function() {
$(this).closest("ul").append(ui.draggable); $(this).closest("ul").append(ui.draggable);
} }
}); });
$(".remove ul").droppable({
drop: function(event, ui) {
if (ui.draggable[0].getAttribute('request_id') != null){
$.ajax({
type: "DELETE",
url: "/requests/" + ui.draggable[0].getAttribute('request_id') ,
data: {"accept" : false }
});
alert("Removed Request, proably want an undo countdown.")
ui.draggable[0].fadeOut("slow")
}
}
});
}); });
$(".group h3").live( 'click', function() { $(".group h3").live( 'click', function() {
......
...@@ -772,7 +772,8 @@ h1.big_text ...@@ -772,7 +772,8 @@ h1.big_text
.group, .group,
.requests .requests,
.remove
:list :list
:style none :style none
......
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