Correctly show newly colored labels everywhere

ivaldi · Sep 26, 2014 · 7dbb0ec · 7dbb0ec
1 parent b425bbd
commit 7dbb0ec
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/app/views/labelings/_labeling.html.erb b/app/views/labelings/_labeling.html.erb
@@ -1,4 +1,4 @@
-<li class="radius label" data-labeling-id="<%= labeling.id %>">
+<li style="background: <%= labeling.label.color %>" class="radius label" data-labeling-id="<%= labeling.id %>">
   <%= labeling.label.name %>
   <%= link_to labeling_path(labeling), method: :delete, remote: true do %>
     <span class="fa-times fa" style="color: #eee"></span>

diff --git a/app/views/labels/_label.html.erb b/app/views/labels/_label.html.erb
@@ -0,0 +1 @@
+<span style="background: <%= label.color %>" class="radius label"><%= label.name %></span>
diff --git a/app/views/tickets/index.html.erb b/app/views/tickets/index.html.erb
@@ -47,7 +47,7 @@
           </td>
           <td class="text-secondary table-nowrap">
             <% ticket.labels.viewable_by(current_user).each do |label| %>
-              <span class="radius label"><%= label.name %></span>
+              <%= render label %>
             <% end %>
             <% if !ticket.subject.nil? %>
               <a href="<%= ticket_url(ticket) %>">
@@ -84,7 +84,7 @@
             <% if !ticket.subject.nil? %>
               <a href="<%= ticket_url(ticket) %>">
                 <% ticket.labels.viewable_by(current_user).each do |label| %>
-                  <span class="radius label"><%= label.name %></span>
+                  <%= render label %>
                 <% end %>
 
                 <% if ticket.replies.size > 0 %>

diff --git a/app/views/tickets/show.html.erb b/app/views/tickets/show.html.erb
@@ -161,7 +161,7 @@
             <dd>
               <ul class="inline-list">
                 <% @ticket.labels.viewable_by(current_user).each do |label| %>
-                  <li class="radius label"><%= label.name %></li>
+                  <li><%= render label %></li>
                 <% end %>
               </ul>
             </dd>