From db9f0eb772ffcab2889c0b67dc2fef5b1cff9397 Mon Sep 17 00:00:00 2001 From: Mantas Masalskis Date: Tue, 14 Apr 2020 00:06:11 +0300 Subject: [PATCH] Fixes #2698 - Custom ordering of Macros impossible (ordered by time added). --- app/assets/javascripts/app/controllers/ticket_overview.coffee | 2 +- .../app/controllers/ticket_zoom/attribute_bar.coffee | 2 +- app/assets/javascripts/app/models/macro.coffee | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/ticket_overview.coffee b/app/assets/javascripts/app/controllers/ticket_overview.coffee index d854b5ad0..1fa7f54cd 100644 --- a/app/assets/javascripts/app/controllers/ticket_overview.coffee +++ b/app/assets/javascripts/app/controllers/ticket_overview.coffee @@ -644,7 +644,7 @@ class App.TicketOverview extends App.Controller renderOptionsMacros: => @possibleMacros = [] - macros = App.Macro.search(filter: { active: true }, sortBy:'name', order:'DESC') + macros = App.Macro.getList() items = @el.find('[name="bulk"]:checked') 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 48c604ab5..b66459686 100644 --- a/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee +++ b/app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee @@ -41,7 +41,7 @@ class App.TicketZoomAttributeBar extends App.Controller if @resetButton.get(0) && !@resetButton.hasClass('hide') resetButtonShown = true - macros = App.Macro.search(filter: { active: true }, sortBy:'name', order:'DESC') + macros = App.Macro.getList() @macroLastUpdated = App.Macro.lastUpdatedAt() @possibleMacros = [] diff --git a/app/assets/javascripts/app/models/macro.coffee b/app/assets/javascripts/app/models/macro.coffee index d2bac8d89..aa3e4b1d7 100644 --- a/app/assets/javascripts/app/models/macro.coffee +++ b/app/assets/javascripts/app/models/macro.coffee @@ -23,6 +23,10 @@ class App.Macro extends App.Model 'group_ids', ] + # get list of macros to show in UI + @getList: -> + App.Macro.search(filter: { active: true }, sortBy:'name', order:'ASC') + @description = ''' Macros make it easy to automate common, multi-step tasks within Zammad.