Skip to content

Commit

Permalink
Merge pull request #16225 from craftcms/bugfix/16184-failed-jobs-and-…
Browse files Browse the repository at this point in the history
…queue-manager-permission

Bugfix/16184 failed jobs and queue manager permission
  • Loading branch information
brandonkelly authored Nov 28, 2024
2 parents 2ca15b1 + 376aa8a commit ef1424a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG-WIP.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
# Release notes for Craft CMS 4.14 (WIP)

## Content Management
- The global sidebar no longer shows “Failed” for queue jobs, for users that don’t have access to the Queue Manager. ([#16184](https://github.com/craftcms/cms/issues/16184))

## System
- Updated Twig to 3.15. ([#16207](https://github.com/craftcms/cms/discussions/16207))
2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/cp/dist/cp.js.map

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion src/web/assets/cp/src/js/CP.js
Original file line number Diff line number Diff line change
Expand Up @@ -1538,7 +1538,12 @@ Craft.CP = Garnish.Base.extend(
} else if (
this.displayedJobInfo.status === Craft.CP.JOB_STATUS_FAILED
) {
this.jobProgressIcon.showFailMode(Craft.t('app', 'Failed'));
if (Craft.canAccessQueueManager) {
this.jobProgressIcon.showFailMode(Craft.t('app', 'Failed'));
} else {
this.jobProgressIcon.$a.remove();
this.jobProgressIcon.destroy();
}
}
} else {
if (this.jobProgressIcon) {
Expand Down

0 comments on commit ef1424a

Please sign in to comment.