From 050918a310aeca18ca02a15237e82740e59ab9e9 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Thu, 25 Nov 2010 10:29:35 -0800
Subject: [PATCH] Added link to manage aspects page from sidebar. Now you can
drag requests from that page, but not existing contacts. d&d interface for
moving contacts between aspects needs some thought.
---
app/views/shared/_aspect_contacts.haml | 2 +-
public/javascripts/aspect-edit.js | 2 +-
spec/javascripts/aspect-edit-spec.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/views/shared/_aspect_contacts.haml b/app/views/shared/_aspect_contacts.haml
index 0de9d5e9f9..6979e42a8d 100644
--- a/app/views/shared/_aspect_contacts.haml
+++ b/app/views/shared/_aspect_contacts.haml
@@ -89,7 +89,7 @@
%br
%h3{:style=>"position:relative;"}
- = t('.aspects')
+ = link_to(t('.aspects'), aspects_manage_path)
.right{:style=>"font-size:12px;top:7px;"}
= link_to t('.add_aspect'), '#add_aspect_pane', :class => "add_aspect_button"
diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js
index 2c80058150..a2aea60d28 100644
--- a/public/javascripts/aspect-edit.js
+++ b/public/javascripts/aspect-edit.js
@@ -6,7 +6,7 @@
var AspectEdit = {
initialize: function() {
- $("ul .person").draggable({
+ $("ul .person.request").draggable({
revert: true,
start: AspectEdit.startDrag,
drag: AspectEdit.duringDrag,
diff --git a/spec/javascripts/aspect-edit-spec.js b/spec/javascripts/aspect-edit-spec.js
index 258eeb0617..3b340039b8 100644
--- a/spec/javascripts/aspect-edit-spec.js
+++ b/spec/javascripts/aspect-edit-spec.js
@@ -22,7 +22,7 @@ describe("AspectEdit", function() {
drag: AspectEdit.duringDrag,
stop: AspectEdit.stopDrag
});
- expect($.fn.draggable.mostRecentCall.object.selector).toEqual("ul .person");
+ expect($.fn.draggable.mostRecentCall.object.selector).toEqual("ul .person.request");
});
it("calls droppable on .aspect ul.dropzone", function() {
spyOn($.fn, "droppable");
--
GitLab