Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes #2698 - Custom ordering of Macros impossible (ordered by time added).

Browse source
This commit is contained in:
Mantas Masalskis 2020-04-14 00:06:11 +03:00 committed by Thorsten Eckel
parent 5bcb650b54
commit db9f0eb772
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/ticket_overview.coffee
View file

@ -644,7 +644,7 @@ class App.TicketOverview extends App.Controller
renderOptionsMacros: => renderOptionsMacros: =>
@possibleMacros = [] @possibleMacros = []
macros = App.Macro.search(filter: { active: true }, sortBy:'name', order:'DESC') macros = App.Macro.getList()
items = @el.find('[name="bulk"]:checked') items = @el.find('[name="bulk"]:checked')

2
app/assets/javascripts/app/controllers/ticket_zoom/attribute_bar.coffee
View file

@ -41,7 +41,7 @@ class App.TicketZoomAttributeBar extends App.Controller
if @resetButton.get(0) && !@resetButton.hasClass('hide') if @resetButton.get(0) && !@resetButton.hasClass('hide')
resetButtonShown = true resetButtonShown = true
macros = App.Macro.search(filter: { active: true }, sortBy:'name', order:'DESC') macros = App.Macro.getList()
@macroLastUpdated = App.Macro.lastUpdatedAt() @macroLastUpdated = App.Macro.lastUpdatedAt()
@possibleMacros = [] @possibleMacros = []

4
app/assets/javascripts/app/models/macro.coffee
View file

@ -23,6 +23,10 @@ class App.Macro extends App.Model
'group_ids', 'group_ids',
] ]
# get list of macros to show in UI
@getList: ->
App.Macro.search(filter: { active: true }, sortBy:'name', order:'ASC')
@description = ''' @description = '''
Macros make it easy to automate common, multi-step tasks within Zammad. Macros make it easy to automate common, multi-step tasks within Zammad.