From 24a640d93e169ad13061a32795d2f66b44ad9c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Sat, 14 May 2022 20:29:33 -0400
Subject: [PATCH] fix: alert template error. closes #10620

---
 public/src/admin/admin.js            | 31 ++++++++++++++--------------
 public/src/admin/modules/instance.js |  4 ----
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index ce35d5860a..c31dea6acc 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -157,26 +157,25 @@ require('../../scripts-admin');
 	}
 
 	function setupRestartLinks() {
-		$('.rebuild-and-restart').off('click').on('click', function () {
-			require(['bootbox'], function (bootbox) {
-				bootbox.confirm('[[admin/admin:alert.confirm-rebuild-and-restart]]', function (confirm) {
-					if (confirm) {
-						require(['admin/modules/instance'], function (instance) {
+		require(['benchpress', 'bootbox', 'admin/modules/instance'], function (benchpress, bootbox, instance) {
+			// need to preload the compiled alert template
+			// otherwise it can be unloaded when rebuild & restart is run
+			// the client can't fetch the template file, resulting in an error
+			benchpress.render('alert', {}).then(function () {
+				$('.rebuild-and-restart').off('click').on('click', function () {
+					bootbox.confirm('[[admin/admin:alert.confirm-rebuild-and-restart]]', function (confirm) {
+						if (confirm) {
 							instance.rebuildAndRestart();
-						});
-					}
+						}
+					});
 				});
-			});
-		});
 
-		$('.restart').off('click').on('click', function () {
-			require(['bootbox'], function (bootbox) {
-				bootbox.confirm('[[admin/admin:alert.confirm-restart]]', function (confirm) {
-					if (confirm) {
-						require(['admin/modules/instance'], function (instance) {
+				$('.restart').off('click').on('click', function () {
+					bootbox.confirm('[[admin/admin:alert.confirm-restart]]', function (confirm) {
+						if (confirm) {
 							instance.restart();
-						});
-					}
+						}
+					});
 				});
 			});
 		});
diff --git a/public/src/admin/modules/instance.js b/public/src/admin/modules/instance.js
index c2da2d5653..7665d31286 100644
--- a/public/src/admin/modules/instance.js
+++ b/public/src/admin/modules/instance.js
@@ -2,10 +2,6 @@
 
 define('admin/modules/instance', [
 	'alerts',
-	// need to preload the compiled alert template
-	// otherwise it can be unloaded when rebuild & restart is run
-	// the client can't fetch the template file, resulting in an error
-	config.relative_path + '/assets/templates/alert.js',
 ], function (alerts) {
 	const instance = {};