diff --git a/framework/webtools/config/WebtoolsUiLabels.xml b/framework/webtools/config/WebtoolsUiLabels.xml index 6edef76fa0d..472b8008047 100644 --- a/framework/webtools/config/WebtoolsUiLabels.xml +++ b/framework/webtools/config/WebtoolsUiLabels.xml @@ -1309,6 +1309,9 @@ Are you sure you want to delete? Êtes-vous sûr de vouloir supprimer l'élément ? + + This action is irreversible. Are you sure you want to delete + Anzahl Count diff --git a/framework/webtools/template/entity/CheckDb.ftl b/framework/webtools/template/entity/CheckDb.ftl index 90210d7ca1b..17fc7695182 100644 --- a/framework/webtools/template/entity/CheckDb.ftl +++ b/framework/webtools/template/entity/CheckDb.ftl @@ -61,7 +61,7 @@ under the License. }

${uiLabelMap.WebtoolsRemoveAllTables}

-
+ @@ -80,7 +80,7 @@ under the License.
-
+ @@ -125,7 +125,7 @@ under the License.
-
+ @@ -168,7 +168,7 @@ under the License.
-
+ @@ -214,7 +214,7 @@ under the License.
-
+ @@ -249,7 +249,7 @@ under the License.
-
+ @@ -285,7 +285,7 @@ under the License.
-
+ @@ -329,4 +329,3 @@ under the License. - diff --git a/framework/webtools/template/entity/EntityImportDir.ftl b/framework/webtools/template/entity/EntityImportDir.ftl index d78235ab0ac..6b75fd0af71 100644 --- a/framework/webtools/template/entity/EntityImportDir.ftl +++ b/framework/webtools/template/entity/EntityImportDir.ftl @@ -26,7 +26,7 @@ under the License.
- +
diff --git a/framework/webtools/template/entity/ViewGeneric.ftl b/framework/webtools/template/entity/ViewGeneric.ftl index bdb757e4302..b7084f7ce4d 100644 --- a/framework/webtools/template/entity/ViewGeneric.ftl +++ b/framework/webtools/template/entity/ViewGeneric.ftl @@ -60,7 +60,8 @@ function ShowTab(lname) { <#if value?has_content> <#if hasDeletePermission> - + <#assign deleteConfirmMessage = "${uiLabelMap.WebtoolsConfirmIrreversibleDelete} ${entityName} ${findByPk}?" /> + <#list pkNamesValuesMap.keySet() as pkName> diff --git a/framework/webtools/widget/CacheForms.xml b/framework/webtools/widget/CacheForms.xml index e25e364e1fd..aea86b2df67 100644 --- a/framework/webtools/widget/CacheForms.xml +++ b/framework/webtools/widget/CacheForms.xml @@ -52,7 +52,8 @@ under the License. - + @@ -64,7 +65,8 @@ under the License. - + diff --git a/framework/webtools/widget/GeoManagementForms.xml b/framework/webtools/widget/GeoManagementForms.xml index b3f7c607c4c..0a04b65520d 100644 --- a/framework/webtools/widget/GeoManagementForms.xml +++ b/framework/webtools/widget/GeoManagementForms.xml @@ -60,7 +60,8 @@ - + @@ -172,7 +173,9 @@ - + + + diff --git a/framework/webtools/widget/Menus.xml b/framework/webtools/widget/Menus.xml index 34b6e93c257..969a24709de 100644 --- a/framework/webtools/widget/Menus.xml +++ b/framework/webtools/widget/Menus.xml @@ -259,13 +259,14 @@ under the License. - + - + @@ -277,7 +278,7 @@ under the License. - +