From 8e7c30cafae101fc9b0ba8536a3e68f994a5bd3c Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sun, 10 Apr 2022 22:15:04 +0800 Subject: [PATCH] removed ID limitation from on_delete of shopfloor api --- myems-admin/app/translations.js | 3 --- myems-api/core/shopfloor.py | 3 --- myems-web/src/i18n.js | 3 --- 3 files changed, 9 deletions(-) diff --git a/myems-admin/app/translations.js b/myems-admin/app/translations.js index 4c2844e1..ea9af7dd 100644 --- a/myems-admin/app/translations.js +++ b/myems-admin/app/translations.js @@ -979,7 +979,6 @@ function config($translateProvider) { THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter', THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter', THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter', - THIS_SHOPFLOOR_CANNOT_BE_DELETED: 'This Shopfloor Cannot Be Deleted', THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted', TIMEZONE_NOT_FOUND: 'Timezone Not Found', TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login', @@ -1979,7 +1978,6 @@ function config($translateProvider) { THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter', THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter', THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter', - THIS_SHOPFLOOR_CANNOT_BE_DELETED: 'This Shopfloor Cannot Be Deleted', THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted', TIMEZONE_NOT_FOUND: 'Timezone Not Found', TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login', @@ -2977,7 +2975,6 @@ function config($translateProvider) { THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter', THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter', THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter', - THIS_SHOPFLOOR_CANNOT_BE_DELETED: 'This Shopfloor Cannot Be Deleted', THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted', TIMEZONE_NOT_FOUND: 'Timezone Not Found', TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login', diff --git a/myems-api/core/shopfloor.py b/myems-api/core/shopfloor.py index 1d06706d..f3ec62fb 100644 --- a/myems-api/core/shopfloor.py +++ b/myems-api/core/shopfloor.py @@ -262,9 +262,6 @@ class ShopfloorItem: if not id_.isdigit() or int(id_) <= 0: raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', description='API.INVALID_SHOPFLOOR_ID') - if int(id_) == 1: - raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', - description='API.THIS_SHOPFLOOR_CANNOT_BE_DELETED') cnx = mysql.connector.connect(**config.myems_system_db) cursor = cnx.cursor() diff --git a/myems-web/src/i18n.js b/myems-web/src/i18n.js index cbae33b4..bdcca5aa 100644 --- a/myems-web/src/i18n.js +++ b/myems-web/src/i18n.js @@ -784,7 +784,6 @@ const resources = { 'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter', 'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter', 'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter', - 'API.THIS_SHOPFLOOR_CANNOT_BE_DELETED': 'This shopfloor cannot be deleted', 'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted', 'API.TIMEZONE_NOT_FOUND': 'Timezone not found', 'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login', @@ -1595,7 +1594,6 @@ const resources = { 'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter', 'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter', 'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter', - 'API.THIS_SHOPFLOOR_CANNOT_BE_DELETED': 'This shopfloor cannot be deleted', 'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted', 'API.TIMEZONE_NOT_FOUND': 'Timezone not found', 'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login', @@ -2379,7 +2377,6 @@ const resources = { 'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter', 'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter', 'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter', - 'API.THIS_SHOPFLOOR_CANNOT_BE_DELETED': 'This shopfloor cannot be deleted', 'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted', 'API.TIMEZONE_NOT_FOUND': 'Timezone not found', 'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login',