From 2244c01fa1779098be6ae9c3dffbde76e9fa00a3 Mon Sep 17 00:00:00 2001
From: dheeraj12347 <dheerajbansal387@gmail.com>
Date: Sat, 21 Feb 2026 19:20:34 +0000
Subject: [PATCH 1/2] ui: avoid 404 after deleting template zones

---
 ui/src/views/image/TemplateZones.vue | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue
index e517aad5167d..bc4674f84b64 100644
--- a/ui/src/views/image/TemplateZones.vue
+++ b/ui/src/views/image/TemplateZones.vue
@@ -91,7 +91,7 @@
           :rowKey="record => record.datastoreId">
           <template #bodyCell="{ text, record, column }">
             <template v-if="column.dataIndex === 'datastore' && record.datastoreId">
-                <router-link :to="{ path: '/storagepool/' + encodeURIComponent(record.datastoreId) }">
+              <router-link :to="{ path: '/storagepool/' + encodeURIComponent(record.datastoreId) }">
                 {{ text }}
               </router-link>
             </template>
@@ -107,7 +107,7 @@
           :rowKey="record => record.datastoreId">
           <template #bodyCell="{ text, record, column }">
             <template v-if="column.dataIndex === 'datastore' && record.datastoreId">
-                <router-link :to="{ path: '/imagestore/' + record.datastoreId }">
+              <router-link :to="{ path: '/imagestore/' + record.datastoreId }">
                 {{ text }}
               </router-link>
             </template>
@@ -139,7 +139,13 @@
       :pageSize="pageSize"
       :total="itemCount"
       :showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
-      :pageSizeOptions="['10', '20', '40', '80', '100']"
+      :pageSizeOptions="[
+        '10',
+        '20',
+        '40',
+        '80',
+        '100'
+      ]"
       @change="handleChangePage"
       @showSizeChange="handleChangePageSize"
       showSizeChanger>
@@ -217,7 +223,9 @@
           <a-alert type="error">
             <template #message>
               <exclamation-circle-outlined style="color: red; fontSize: 30px; display: inline-flex" />
-              <span style="padding-left: 5px" v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`" />
+              <span
+                style="padding-left: 5px"
+                v-html="'<b>' + selectedRowKeys.length + ' ' + $t('label.items.selected') + '. </b>'" />
               <span v-html="$t(message.confirmMessage)" />
             </template>
           </a-alert>
@@ -391,10 +399,10 @@ export default {
   },
   computed: {
     isActionsOnTemplatePermitted () {
-      return (['Admin'].includes(this.$store.getters.userInfo.roletype) || // If admin or owner or belongs to current project
+      return (['Admin'].includes(this.$store.getters.userInfo.roletype) ||
         (this.resource.domainid === this.$store.getters.userInfo.domainid && this.resource.account === this.$store.getters.userInfo.account) ||
         (this.resource.domainid === this.$store.getters.userInfo.domainid && this.resource.projectid && this.$store.getters.project && this.$store.getters.project.id && this.resource.projectid === this.$store.getters.project.id)) &&
-        (this.resource.isready || !this.resource.status || this.resource.status.indexOf('Downloaded') === -1) && // Template is ready or downloaded
+        (this.resource.isready || !this.resource.status || this.resource.status.indexOf('Downloaded') === -1) &&
         this.resource.templatetype !== 'SYSTEM'
     }
   },

From cf2f33178ee99974a2e24cecb60c57feac368cd7 Mon Sep 17 00:00:00 2001
From: dheeraj12347 <dheerajbansal387@gmail.com>
Date: Mon, 23 Feb 2026 07:37:17 +0000
Subject: [PATCH 2/2] ui: correctly redirect after bulk deleting template zones

---
 ui/src/views/image/TemplateZones.vue | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue
index bc4674f84b64..31b65e556a4b 100644
--- a/ui/src/views/image/TemplateZones.vue
+++ b/ui/src/views/image/TemplateZones.vue
@@ -139,13 +139,7 @@
       :pageSize="pageSize"
       :total="itemCount"
       :showTotal="total => `${$t('label.total')} ${total} ${$t('label.items')}`"
-      :pageSizeOptions="[
-        '10',
-        '20',
-        '40',
-        '80',
-        '100'
-      ]"
+      :pageSizeOptions="['10', '20', '40', '80', '100']"
       @change="handleChangePage"
       @showSizeChange="handleChangePageSize"
       showSizeChanger>
@@ -225,7 +219,7 @@
               <exclamation-circle-outlined style="color: red; fontSize: 30px; display: inline-flex" />
               <span
                 style="padding-left: 5px"
-                v-html="'<b>' + selectedRowKeys.length + ' ' + $t('label.items.selected') + '. </b>'" />
+                v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`" />
               <span v-html="$t(message.confirmMessage)" />
             </template>
           </a-alert>
@@ -484,7 +478,7 @@ export default {
       this.showTable = false
       this.fetchData()
       if (this.dataSource.length === 0) {
-        this.$router.go(-1)
+        this.$router.push({ path: '/template' })
       }
     },
     getOkProps () {