Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions framework/webtools/config/WebtoolsUiLabels.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1309,6 +1309,9 @@
<value xml:lang="en">Are you sure you want to delete?</value>
<value xml:lang="fr">Êtes-vous sûr de vouloir supprimer l'élément ?</value>
</property>
<property key="WebtoolsConfirmIrreversibleDelete">
<value xml:lang="en">This action is irreversible. Are you sure you want to delete</value>
</property>
<property key="WebtoolsCount">
<value xml:lang="de">Anzahl</value>
<value xml:lang="en">Count</value>
Expand Down
15 changes: 7 additions & 8 deletions framework/webtools/template/entity/CheckDb.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ under the License.
}
</script>
<h3>${uiLabelMap.WebtoolsRemoveAllTables}</h3>
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" name="TablesRemoveForm">
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" name="TablesRemoveForm" onsubmit="return confirm('${uiLabelMap.WebtoolsConfirmIrreversibleDelete?js_string} ${uiLabelMap.WebtoolsRemoveAllTables?js_string}: ' + this.groupName.value + '?');">
<table class="basic-table" cellspacing="0">
<tbody>
<tr>
Expand All @@ -80,7 +80,7 @@ under the License.
</tbody>
</table>
</form>
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" name="TableRemoveForm">
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" name="TableRemoveForm" onsubmit="return confirm('${uiLabelMap.WebtoolsConfirmIrreversibleDelete?js_string} ${uiLabelMap.WebtoolsRemoveAllTables?js_string}: ' + this.entityName.value + '?');">
<table class="basic-table" cellspacing="0">
<tbody>
<tr>
Expand Down Expand Up @@ -125,7 +125,7 @@ under the License.
</tbody>
</table>
</form>
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>">
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" onsubmit="return confirm('${uiLabelMap.WebtoolsConfirmIrreversibleDelete?js_string} ${uiLabelMap.WebtoolsCreateRemoveAllPrimaryKeys?js_string}: ' + this.groupName.value + '?');">
<table class="basic-table" cellspacing="0">
<tbody>
<tr>
Expand Down Expand Up @@ -168,7 +168,7 @@ under the License.
</tbody>
</table>
</form>
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>">
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" onsubmit="return confirm('${uiLabelMap.WebtoolsConfirmIrreversibleDelete?js_string} ${uiLabelMap.WebtoolsCreateRemovePrimaryKey?js_string}: ' + this.entityName.value + '?');">
<table class="basic-table" cellspacing="0">
<tbody>
<tr>
Expand Down Expand Up @@ -214,7 +214,7 @@ under the License.
</tbody>
</table>
</form>
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>">
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" onsubmit="return confirm('${uiLabelMap.WebtoolsConfirmIrreversibleDelete?js_string} ${uiLabelMap.WebtoolsCreateRemoveAllDeclaredIndices?js_string}: ' + this.groupName.value + '?');">
<table class="basic-table" cellspacing="0">
<tbody>
<tr>
Expand Down Expand Up @@ -249,7 +249,7 @@ under the License.
</tbody>
</table>
</form>
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>">
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" onsubmit="return confirm('${uiLabelMap.WebtoolsConfirmIrreversibleDelete?js_string} ${uiLabelMap.WebtoolsCreateRemoveAllForeignKeyIndices?js_string}: ' + this.groupName.value + '?');">
<table class="basic-table" cellspacing="0">
<tbody>
<tr>
Expand Down Expand Up @@ -285,7 +285,7 @@ under the License.
</tbody>
</table>
</form>
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>">
<form class="basic-form" method="post" action="<@ofbizUrl>${checkDbURL}</@ofbizUrl>" onsubmit="return confirm('${uiLabelMap.WebtoolsConfirmIrreversibleDelete?js_string} ${uiLabelMap.WebtoolsCreateRemoveAllForeignKeys?js_string}: ' + this.groupName.value + '?');">
<table class="basic-table" cellspacing="0">
<tbody>
<tr>
Expand Down Expand Up @@ -329,4 +329,3 @@ under the License.
</#list>
</ul>
</#if>

2 changes: 1 addition & 1 deletion framework/webtools/template/entity/EntityImportDir.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
</#if>
<hr />

<form class="basic-form" method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>">
<form class="basic-form" method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>" onsubmit="return !this.deleteFiles.checked || confirm('${uiLabelMap.WebtoolsConfirmIrreversibleDelete?js_string} ${uiLabelMap.WebtoolsDeleteFiles?js_string}: ' + this.path.value + '?');">
<table class="basic-table" cellspacing="0">
<tbody>
<tr>
Expand Down
3 changes: 2 additions & 1 deletion framework/webtools/template/entity/ViewGeneric.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ function ShowTab(lname) {
</#if>
<#if value?has_content>
<#if hasDeletePermission>
<form action='<@ofbizUrl>entity/change/${currentFindString}</@ofbizUrl>' method="post" name="updateForm">
<#assign deleteConfirmMessage = "${uiLabelMap.WebtoolsConfirmIrreversibleDelete} ${entityName} ${findByPk}?" />
<form action='<@ofbizUrl>entity/change/${currentFindString}</@ofbizUrl>' method="post" name="updateForm" onsubmit="return confirm('${deleteConfirmMessage?js_string}');">
<input type="hidden" value="DELETE" name="_method"/>
<#list pkNamesValuesMap.keySet() as pkName>
<input type="hidden" value="${pkNamesValuesMap.get(pkName)}" name="${pkName}"/>
Expand Down
6 changes: 4 additions & 2 deletions framework/webtools/widget/CacheForms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ under the License.
</hyperlink>
</field>
<field name="FindUtilCacheClear" title=" " use-when="hasUtilCacheEdit" widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonClear}" target="FindUtilCacheClear" >
<hyperlink description="${uiLabelMap.CommonClear}" target="FindUtilCacheClear"
request-confirmation="true" confirmation-message="${uiLabelMap.WebtoolsConfirmIrreversibleDelete} cache ${cacheName}?">
<parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
</hyperlink>
</field>
Expand All @@ -64,7 +65,8 @@ under the License.
<field name="lineSize" title="${uiLabelMap.WebtoolsBytes}" sort-field="true"><display/></field>

<field name="administration" title=" " widget-style="buttontext" use-when="hasUtilCacheEdit">
<hyperlink description="${uiLabelMap.CommonRemove}" target="FindUtilCacheElementsRemoveElement">
<hyperlink description="${uiLabelMap.CommonRemove}" target="FindUtilCacheElementsRemoveElement"
request-confirmation="true" confirmation-message="${uiLabelMap.WebtoolsConfirmIrreversibleDelete} cache element ${elementKey}?">
<parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
<parameter param-name="UTIL_CACHE_ELEMENT_NUMBER" from-field="keyNum"/>
</hyperlink>
Expand Down
7 changes: 5 additions & 2 deletions framework/webtools/widget/GeoManagementForms.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@
</field>
<field name="wellKnownText" title="${uiLabelMap.CommonGeoWellKnownText}"><display/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonRemove}" target="deleteGeo">
<hyperlink description="${uiLabelMap.CommonRemove}" target="deleteGeo"
request-confirmation="true" confirmation-message="${uiLabelMap.WebtoolsConfirmIrreversibleDelete} Geo ${geoId}?">
<parameter param-name="geoId"/>
<parameter param-name="noConditionFind" value="Y"/>
</hyperlink>
Expand Down Expand Up @@ -172,7 +173,9 @@
<field name="geoAssocTypeId" title="${uiLabelMap.CommonGeoAssocTypeId}">
<display-entity entity-name="GeoAssocType" key-field-name="geoAssocTypeId"/>
</field>
<field name="delete" title="${uiLabelMap.CommonDelete}"><submit/></field>
<field name="delete" title="${uiLabelMap.CommonDelete}">
<submit request-confirmation="true" confirmation-message="${uiLabelMap.WebtoolsConfirmIrreversibleDelete} GeoAssoc ${geoId} -> ${geoIdTo}?"/>
</field>
</grid>

</forms>
7 changes: 4 additions & 3 deletions framework/webtools/widget/Menus.xml
Original file line number Diff line number Diff line change
Expand Up @@ -259,13 +259,14 @@ under the License.
<link target="FindUtilCache"/>
</menu-item>
<menu-item name="clearAll" title="${uiLabelMap.WebtoolsClearAllCaches}">
<link target="FindUtilCacheClearAll"/>
<link target="FindUtilCacheClearAll" request-confirmation="true" confirmation-message="${uiLabelMap.WebtoolsConfirmIrreversibleDelete} ${uiLabelMap.WebtoolsClearAllCaches}?"/>
</menu-item>
<menu-item name="forceGarbageCollection" title="${uiLabelMap.WebtoolsRunGC}">
<link target="ForceGarbageCollection"/>
</menu-item>
<menu-item name="clearSelectedCaches" title="${uiLabelMap.WebtoolsClearSelectedCaches}">
<link target="javascript: document.ListCache.submit()" url-mode="plain"/>
<link target="javascript: document.ListCache.submit()" url-mode="plain"
request-confirmation="true" confirmation-message="${uiLabelMap.WebtoolsConfirmIrreversibleDelete} ${uiLabelMap.WebtoolsClearSelectedCaches}?"/>
</menu-item>
</menu>

Expand All @@ -277,7 +278,7 @@ under the License.

<menu name="EditCache" extends="CommonButtonBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="clear" title="${uiLabelMap.WebtoolsClearThisCache}">
<link target="EditUtilCacheClear">
<link target="EditUtilCacheClear" request-confirmation="true" confirmation-message="${uiLabelMap.WebtoolsConfirmIrreversibleDelete} cache ${cacheName}?">
<parameter param-name="UTIL_CACHE_NAME" from-field="cacheName"/>
<parameter param-name="type" from-field="parameters.type"/>
</link>
Expand Down
Loading