diff --git a/admin/app/controllers/settings/meter/offline-meter-file.controller.js b/admin/app/controllers/settings/meter/offline-meter-file.controller.js index 71bd0b9e..3adbf577 100644 --- a/admin/app/controllers/settings/meter/offline-meter-file.controller.js +++ b/admin/app/controllers/settings/meter/offline-meter-file.controller.js @@ -27,22 +27,22 @@ app.controller('OfflineMeterFileController', function($scope, $common, $cookies }, 'success': function(file, xhr) { //console.log('File success to upload from dropzone', file, xhr); - var templateName = file.name; + var templateName = file.name; - var popType = 'TOASTER.SUCCESS'; - var popTitle = $common.toaster.success_title; - var popBody = $common.toaster.success_add_body; + var popType = 'TOASTER.SUCCESS'; + var popTitle = $common.toaster.success_title; + var popBody = $common.toaster.success_add_body; - popType = $translate.instant(popType); - popTitle = $translate.instant(popTitle); - popBody = $translate.instant(popBody,{template: templateName}); + popType = $translate.instant(popType); + popTitle = $translate.instant(popTitle); + popBody = $translate.instant(popBody,{template: templateName}); - toaster.pop({ - type: popType, - title: popTitle, - body: popBody, - showCloseButton: true, - }); + toaster.pop({ + type: popType, + title: popTitle, + body: popBody, + showCloseButton: true, + }); // toaster.pop({ // type: 'success', @@ -77,15 +77,15 @@ app.controller('OfflineMeterFileController', function($scope, $common, $cookies $scope.deleteOfflineMeterFile = function(offlinemeterfile) { SweetAlert.swal({ - title: $translate.instant($common.sweet.title), - text: $translate.instant($common.sweet.text), - type: "warning", - showCancelButton: true, - confirmButtonColor: "#DD6B55", - confirmButtonText: $translate.instant($common.sweet.confirmButtonText), - cancelButtonText: $translate.instant($common.sweet.cancelButtonText), - closeOnConfirm: true, - closeOnCancel: true + title: $translate.instant($common.sweet.title), + text: $translate.instant($common.sweet.text), + type: "warning", + showCancelButton: true, + confirmButtonColor: "#DD6B55", + confirmButtonText: $translate.instant($common.sweet.confirmButtonText), + cancelButtonText: $translate.instant($common.sweet.cancelButtonText), + closeOnConfirm: true, + closeOnCancel: true }, function(isConfirm) { if (isConfirm) { diff --git a/myems-api/core/offlinemeterfile.py b/myems-api/core/offlinemeterfile.py index 10d779a5..37de469b 100644 --- a/myems-api/core/offlinemeterfile.py +++ b/myems-api/core/offlinemeterfile.py @@ -208,8 +208,8 @@ class OfflineMeterFileItem: # remove the file from disk os.remove(file_path) except Exception as ex: - raise falcon.HTTPError(falcon.HTTP_400, title='API.ERROR', - description='API.OFFLINE_METER_FILE_NOT_FOUND') + # ignore exception and don't return API.OFFLINE_METER_FILE_NOT_FOUND error + pass # Note: the energy data imported from the deleted file will not be deleted cursor.execute(" DELETE FROM tbl_offline_meter_files WHERE id = %s ", (id_,))