extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix deleting category from edit dialog didn't work

Browse Source
This commit is contained in:
nathangray 2019-05-08 14:31:50 -06:00
parent f2ae317771
commit d046cf67fd
3 changed files with 4 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/templates/default/categories.delete.xet
View File

@ -2,7 +2,7 @@
<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd"> <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="admin.categories.delete.delete"> <template id="admin.categories.delete.message">
<description value="Are you sure you want to delete this category?"/> <description value="Are you sure you want to delete this category?"/>
</template> </template>
<template id="admin.categories.delete"> <template id="admin.categories.delete">
@ -12,7 +12,7 @@
<tab id="main" label="Category"/> <tab id="main" label="Category"/>
</tabs> </tabs>
<tabpanels> <tabpanels>
<template id="admin.categories.delete.delete"/> <template id="admin.categories.delete.message"/>
</tabpanels> </tabpanels>
</tabbox> </tabbox>
<hbox class="dialogFooterToolbar" id="button"> <hbox class="dialogFooterToolbar" id="button">

35
admin/templates/default/categories.edit.xet
View File

@ -2,38 +2,6 @@
<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd"> <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <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"> <template id="admin.categories.edit.category" template="" lang="" group="0" version="1.9.001">
<grid width="100%"> <grid width="100%">
<columns> <columns>
@ -81,7 +49,6 @@
</rows> </rows>
</grid> </grid>
<template id="admin.categories.delete" class="globalCat_hiddenCatid"/>
</template> </template>
<template id="admin.categories.edit" template="" lang="" group="0" version="1.9.001"> <template id="admin.categories.edit" template="" lang="" group="0" version="1.9.001">
<grid width="100%"> <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="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"/> <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 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> </hbox>
</row> </row>
</rows> </rows>

34
admin/templates/mobile/categories.edit.xet
View File

@ -2,38 +2,6 @@
<!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd"> <!DOCTYPE overlay PUBLIC "-//EGroupware GmbH//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <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"> <template id="admin.categories.edit" template="" lang="" group="0" version="1.9.001">
<grid width="100%"> <grid width="100%">
<columns> <columns>
@ -46,7 +14,7 @@
<button id="button[save]" onclick="return app.admin.check_owner(widget);" image="save" background_image="1"/> <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"/> <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 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> </hbox>
</row> </row>
<row> <row>