Change default of withBackup to allow null and default with setting value.

Author: WANGF

core/src/main/java/org/fao/geonet/kernel/setting/Settings.java

@@ -144,6 +144,7 @@ public class Settings {
     public static final String METADATA_HISTORY_ENABLED = "metadata/history/enabled";
     public static final String METADATA_HISTORY_ACCESS_LEVEL = "metadata/history/accesslevel";
     public static final String METADATA_PUBLISHED_DELETE_USERPROFILE = "metadata/delete/profilePublishedMetadata";
+    public static final String METADATA_DELETE_ENABLEBACKUP = "metadata/delete/enablebackup";
     public static final String METADATA_PUBLISH_USERPROFILE = "metadata/publication/profilePublishMetadata";
     public static final String METADATA_UNPUBLISH_USERPROFILE = "metadata/publication/profileUnpublishMetadata";
     public static final String METADATA_BACKUPARCHIVE_ENABLE = "metadata/backuparchive/enable";

core/src/test/resources/org/fao/geonet/api/Messages.properties

@@ -246,6 +246,7 @@ api.metadata.share.ErrorUserNotAllowedToPublish=User not allowed to publish the
 api.metadata.share.strategy.groupOwnerOnly=You need to be administrator, or reviewer of the metadata group.
 api.metadata.share.strategy.reviewerInGroup=You need to be administrator, or reviewer of the metadata group or reviewer with edit privilege on the metadata.
 api.metadata.status.errorSetStatusNotAllowed=Only the owner of the metadata can set the status of this record. User is not the owner of the metadata.
+api.metadata.delete.errorWithBackupParamMismatch=The setting metadata/delete/enablebackup: '%s' mismatched the API parameter withBackup '%s'.
 
 feedback_subject_userFeedback=User feedback
 

services/src/main/java/org/fao/geonet/api/records/MetadataInsertDeleteApi.java

@@ -215,8 +215,18 @@ public class MetadataInsertDeleteApi {
     @ResponseStatus(HttpStatus.NO_CONTENT)
     public void deleteRecord(
         @Parameter(description = API_PARAM_RECORD_UUID, required = true) @PathVariable String metadataUuid,
-        @Parameter(description = API_PARAM_BACKUP_FIRST, required = false) @RequestParam(required = false, defaultValue = "true") boolean withBackup,
+        @Parameter(description = API_PARAM_BACKUP_FIRST, required = false) @RequestParam(required = false) Boolean withBackup,
         HttpServletRequest request) throws Exception {
+        boolean isMdDeleteBackupEnable = settingManager.getValueAsBool(Settings.METADATA_DELETE_ENABLEBACKUP);
+        if (withBackup == null) {
+            Log.info(LOGGER, String.format("withBackup paramter is missing. Will use setting of metadata/delete/enablebackup '%s' during the deletion process", isMdDeleteBackupEnable));
+            withBackup = isMdDeleteBackupEnable;
+        } else if (withBackup != isMdDeleteBackupEnable) {
+            ResourceBundle messages = ApiUtils.getMessagesResourceBundle(request.getLocales());
+            throw new IllegalArgumentException(
+                String.format(messages.getString("api.metadata.delete.errorWithBackupParamMismatch"), isMdDeleteBackupEnable, withBackup));
+        }
+
         AbstractMetadata metadata = ApiUtils.canEditRecord(metadataUuid, request);
         ServiceContext context = ApiUtils.createServiceContext(request);
         Store store = context.getBean("resourceStore", Store.class);

web-ui/src/main/resources/catalog/components/catalog/CatalogService.js

@@ -61,11 +61,10 @@
          * Delete a metadata from catalog
          *
          * @param {string} id Internal id of the metadata
-         * @param {string} backupMetadata flag to enable backup during the delete process
          * @return {HttpPromise} Future object
          */
-        remove: function (id, backupMetadata) {
-          return $http.delete("../api/records/" + id, {params: {withBackup: backupMetadata}});
+        remove: function (id) {
+          return $http.delete("../api/records/" + id);
         },
 
         /**

web-ui/src/main/resources/catalog/components/metadataactions/MetadataActionService.js

@@ -268,7 +268,7 @@
       this.deleteMd = function (md, bucket) {
         var deferred = $q.defer();
         if (md) {
-          gnMetadataManager.remove(md.id, gnConfig["metadata.delete.enablebackup"]).then(
+          gnMetadataManager.remove(md.id).then(
             function (data) {
               $timeout(function () {
                 $rootScope.$broadcast("search");
@@ -308,7 +308,7 @@
       };
 
       this.cancelWorkingCopy = function (md) {
-        return gnMetadataManager.remove(md.id, gnConfig["metadata.delete.enablebackup"]);
+        return gnMetadataManager.remove(md.id);
       };
 
       this.getMetadataIdToEdit = function (md) {