nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:diaspora/diaspora

Browse source
This commit is contained in:
Sarah Mei 2010-10-20 20:39:38 -07:00
commit 707952797b
3 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/aspects_controller.rb
View file

@ -99,7 +99,7 @@ class AspectsController < ApplicationController
flash[:error] = I18n.t 'aspects.add_to_aspect.failure'
end
redirect_to aspects_path(params[:aspect_id])
redirect_to aspect_path(params[:aspect_id])
end
def remove_from_aspect

2
app/views/aspects/manage.html.haml
View file

@ -60,7 +60,7 @@
-else
-for person in aspect.people
%li.person{:id => person.id, :from_aspect_id => aspect.id}
%li.person{:id => person.id, :class => person.id, :from_aspect_id => aspect.id}
= person_image_tag(person)
.name
= link_to person.real_name, person

34
public/javascripts/aspect-edit.js
View file

@ -89,28 +89,36 @@ $(function() {
}
$(ui.draggable[0]).fadeOut('slow'); // ui.draggable.fadeOut('slow')
$(ui.draggable[0]).fadeOut('slow');
$(ui.draggable[0]).remove();
}
});
$(".aspect_remove ul").droppable({
hoverClass: 'active',
drop: function(event, ui) {
if ($( "." + ui.draggable[0].id).length == 1) {
alert("You can not remove the person from the last aspect");
} else {
if (!$(ui.draggable[0]).hasClass('requested_person')){
var aspect = ui.draggable[0].getAttribute('from_aspect_id')
var person_id = ui.draggable[0].id
$.ajax({
type: "POST",
url: "/aspects/remove_from_aspect",
data:{
'friend_id' : person_id,
'aspect_id' : aspect
}
});
}
$(ui.draggable[0]).fadeOut('slow');
$(ui.draggable[0]).remove();
if (!$(ui.draggable[0]).hasClass('requested_person')){
var aspect = ui.draggable[0].getAttribute('from_aspect_id')
var person_id = ui.draggable[0].id
$.ajax({
type: "POST",
url: "/aspects/remove_from_aspect",
data:{
'friend_id' : person_id,
'aspect_id' : aspect
}
});
}
$(ui.draggable[0]).fadeOut('slow'); // ui.draggable.fadeOut('slow')
}
});