From d046cf67fd52a28fbdb041ba312a92c3a31daa2e Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Wed, 8 May 2019 14:31:50 -0600
Subject: [PATCH] Fix deleting category from edit dialog didn't work

---
 admin/templates/default/categories.delete.xet |  4 +--
 admin/templates/default/categories.edit.xet   | 35 +------------------
 admin/templates/mobile/categories.edit.xet    | 34 +-----------------
 3 files changed, 4 insertions(+), 69 deletions(-)

diff --git a/admin/templates/default/categories.delete.xet b/admin/templates/default/categories.delete.xet
index 5773b43f34..3525706333 100644
--- a/admin/templates/default/categories.delete.xet
+++ b/admin/templates/default/categories.delete.xet
@@ -2,7 +2,7 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="admin.categories.delete.delete">
+	<template id="admin.categories.delete.message">
 		<description value="Are you sure you want to delete this category?"/>
 	</template>
 	<template id="admin.categories.delete">
@@ -12,7 +12,7 @@
 					<tab id="main" label="Category"/>
 				</tabs>
 				<tabpanels>
-					<template id="admin.categories.delete.delete"/>
+					<template id="admin.categories.delete.message"/>
 				</tabpanels>
 			</tabbox>
 			<hbox class="dialogFooterToolbar" id="button">
diff --git a/admin/templates/default/categories.edit.xet b/admin/templates/default/categories.edit.xet
index 6c98ea4590..85deaf1c4f 100644
--- a/admin/templates/default/categories.edit.xet
+++ b/admin/templates/default/categories.edit.xet
@@ -2,38 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="admin.categories.delete" template="" lang="" group="0" version="1.9.001">
-		<grid>
-			<columns>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<groupbox class="globalCat_confirmDelete">
-						<caption label="Delete this category"/>
-						<grid>
-							<columns>
-								<column/>
-								<column/>
-							</columns>
-							<rows>
-								<row height="30">
-									<description span="all"/>
-								</row>
-								<row>
-									<checkbox align="center" id="delete[subs]" span="all"/>
-								</row>
-								<row height="40">
-									<button align="center" label="Delete" id="delete[delete]" image="delete" background_image="1"/>
-								</row>
-							</rows>
-						</grid>
-					</groupbox>
-				</row>
-			</rows>
-		</grid>
-		<textbox id="delete[cat_id]" class="globalCat_hiddenCatid"/>
-	</template>
 	<template id="admin.categories.edit.category" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
@@ -81,7 +49,6 @@
 
 			</rows>
 		</grid>
-		<template id="admin.categories.delete" class="globalCat_hiddenCatid"/>
 	</template>
 	<template id="admin.categories.edit" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
@@ -113,7 +80,7 @@
 						<button label="Save" id="button[save]" onclick="return app.admin.check_owner(widget);" image="save" background_image="1"/>
 						<button label="Apply" id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply" background_image="1"/>
 						<buttononly label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-						<buttononly align="right" statustext="Delete this category" label="Delete" id="button[delete]" onclick="app.admin.delete_category" image="delete" background_image="1"/>
+						<buttononly align="right" statustext="Delete this category" label="Delete" id="button[delete]" onclick="egw.open_link('admin.admin_categories.delete&amp;cat_id='+widget.getRoot().getArrayMgr('content').getEntry('id'),'_browser','450x400');window.close();" image="delete" background_image="1"/>
 					</hbox>
 				</row>
 			</rows>
diff --git a/admin/templates/mobile/categories.edit.xet b/admin/templates/mobile/categories.edit.xet
index 50c8dad601..97a2ef3d05 100644
--- a/admin/templates/mobile/categories.edit.xet
+++ b/admin/templates/mobile/categories.edit.xet
@@ -2,38 +2,6 @@
 <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
 <!-- $Id$ -->
 <overlay>
-	<template id="admin.categories.delete" template="" lang="" group="0" version="1.9.001">
-		<grid>
-			<columns>
-				<column/>
-			</columns>
-			<rows>
-				<row>
-					<groupbox class="globalCat_confirmDelete">
-						<caption label="Delete this category"/>
-						<grid>
-							<columns>
-								<column/>
-								<column/>
-							</columns>
-							<rows>
-								<row height="30">
-									<description span="all"/>
-								</row>
-								<row>
-									<checkbox align="center" id="delete[subs]" span="all"/>
-								</row>
-								<row height="40">
-									<button align="center" label="Delete" id="delete[delete]" image="delete" background_image="1"/>
-								</row>
-							</rows>
-						</grid>
-					</groupbox>
-				</row>
-			</rows>
-		</grid>
-		<textbox id="delete[cat_id]" class="globalCat_hiddenCatid"/>
-	</template>
 	<template id="admin.categories.edit" template="" lang="" group="0" version="1.9.001">
 		<grid width="100%">
 			<columns>
@@ -46,7 +14,7 @@
 						<button id="button[save]" onclick="return app.admin.check_owner(widget);" image="save" background_image="1"/>
 						<button  id="button[apply]" onclick="return app.admin.check_owner(widget);" image="apply" background_image="1"/>
 						<buttononly id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
-						<buttononly statustext="Delete this category"  id="button[delete]" onclick="app.admin.delete_category" image="delete" background_image="1"/>
+						<buttononly statustext="Delete this category"  id="button[delete]" onclick="egw.open_link('admin.admin_categories.delete','_browser','450x400');window.close();" image="delete" background_image="1"/>
 					</hbox>
 				</row>
 				<row>