From 4ec5993f89ec9f3541f9b86b0c1496e2210238b2 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 14 Mar 2017 12:31:36 +0100
Subject: [PATCH] Fixed issue #838 - Disabled macros are still shown in ticket
 screen.

---
 .../app/controllers/ticket_zoom/attribute_bar.coffee            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee b/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee
index 8e408c16c..6c8de0b6e 100644
--- a/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee
+++ b/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee
@@ -34,7 +34,7 @@ class App.TicketZoomAttributeBar extends App.Controller
     if @resetButton.get(0) && !@resetButton.hasClass('hide')
       resetButtonShown = true
 
-    macros = App.Macro.all()
+    macros = App.Macro.findAllByAttribute('active', true)
     @macroLastUpdated = App.Macro.lastUpdatedAt()
 
     if _.isEmpty(macros) || !@permissionCheck('ticket.agent')