diff --git a/src/server/views/dashboard/templates/queueJobsByState.hbs b/src/server/views/dashboard/templates/queueJobsByState.hbs index a411c5a5..ecf1ea63 100644 --- a/src/server/views/dashboard/templates/queueJobsByState.hbs +++ b/src/server/views/dashboard/templates/queueJobsByState.hbs @@ -50,12 +50,12 @@ data-queue-state="{{ state }}" class="js-bulk-action btn btn-danger"> Remove Jobs - {{#eq state 'failed'}} + {{#if (or (eq state 'failed') (eq state 'delayed'))}} - {{/eq}} + {{/if}}
diff --git a/src/server/views/helpers/handlebars.js b/src/server/views/helpers/handlebars.js index ccbb4963..17cddb1f 100644 --- a/src/server/views/helpers/handlebars.js +++ b/src/server/views/helpers/handlebars.js @@ -121,4 +121,19 @@ module.exports = function registerHelpers(hbs, { queues }) { hbs.registerHelper('useCdn', () => { return queues.useCdn; }); + + hbs.registerHelper({ + eq: (value1, value2) => value1 === value2, + ne: (value1, value2) => value1 !== value2, + lt: (value1, value2) => value1 < value2, + gt: (value1, value2) => value1 > value2, + lte: (value1, value2) => value1 <= value2, + gte: (value1, value2) => value1 >= value2, + and() { + return Array.prototype.every.call(arguments, Boolean); + }, + or() { + return Array.prototype.slice.call(arguments, 0, -1).some(Boolean); + }, + }); };