Fix color update label js. Fixes #128.

ivaldi · Jan 2, 2015 · 3501439 · 3501439
1 parent 6e0351d
commit 3501439
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/app/views/labels/update.js.erb b/app/views/labels/update.js.erb
@@ -1,6 +1,6 @@
 jQuery('#label-id-<%= @label.id %>').css('background', '<%= @label.color %>');
-jQuery('[data-dropdown="label-<%= @label.id %>"]').closest('a').find('i.fa-square').css('color', '<%= @label.color %>');
+jQuery('[data-dropdown="label-<%= @label.id %>"]').closest('a').find('i.fa-circle-o').css('color', '<%= @label.color %>');
 
 <%# close all dropdowns %>
 var dropdowns = jQuery('.f-dropdown');
-dropdowns.foundation('dropdown', 'close', dropdowns);
+dropdowns.foundation('dropdown', 'close', dropdowns);
diff --git a/test/controllers/labelings_controller_test.rb b/test/controllers/labelings_controller_test.rb
@@ -48,4 +48,8 @@ class LabelingsControllerTest < ActionController::TestCase
     end
   end
 
+  test 'should show labels in sidebar' do
+
+  end
+
 end
diff --git a/test/controllers/tickets_controller_test.rb b/test/controllers/tickets_controller_test.rb
@@ -161,6 +161,10 @@ class TicketsControllerTest < ActionController::TestCase
 
     # should contain this anchor for linking from notification email
     assert_select '[id=reply-' + @ticket.replies.first.id.to_s + ']'
+
+    # should have this icon for label color update javascript (sidebar)
+    assert_select 'aside ul li i.fa-circle-o'
+
   end
 
   test 'should email assignee if ticket is assigned by somebody else' do