From f9eb2e39ba7c5cbdc8b10040ac5913090885f574 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Sat, 27 Feb 2021 12:52:27 +0800 Subject: [PATCH] fixed energy item undefined issue when edit virtual meter and offline meter --- CHANGELOG.md | 4 +++- .../controllers/settings/meter/offline-meter.controller.js | 2 +- .../controllers/settings/meter/virtual-meter.controller.js | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6593362a..fd6ee409 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - None. ### Fixed -- None. +- fixed typo in combinedequipment controller in admin. +- removed required property from equipment model in admin. +- fixed energy item undefined issue when edit virtual meter and offline meter. ### Removed - None. diff --git a/admin/app/controllers/settings/meter/offline-meter.controller.js b/admin/app/controllers/settings/meter/offline-meter.controller.js index 681cf6f4..a7358a6d 100644 --- a/admin/app/controllers/settings/meter/offline-meter.controller.js +++ b/admin/app/controllers/settings/meter/offline-meter.controller.js @@ -133,7 +133,7 @@ app.controller('OfflineMeterController', function($scope, $common, $translate, $ modalInstance.result.then(function(modifiedOfflineMeter) { modifiedOfflineMeter.energy_category_id = modifiedOfflineMeter.energy_category.id; - if(angular.isDefined(modifiedOfflineMeter.energy_item)) { + if (modifiedOfflineMeter.energy_item != null && modifiedOfflineMeter.energy_item.id != null ) { modifiedOfflineMeter.energy_item_id = modifiedOfflineMeter.energy_item.id; } else { modifiedOfflineMeter.energy_item_id = undefined; diff --git a/admin/app/controllers/settings/meter/virtual-meter.controller.js b/admin/app/controllers/settings/meter/virtual-meter.controller.js index 95b964de..40fa5738 100644 --- a/admin/app/controllers/settings/meter/virtual-meter.controller.js +++ b/admin/app/controllers/settings/meter/virtual-meter.controller.js @@ -159,7 +159,7 @@ $scope.getAllEnergyItems = function() { modalInstance.result.then(function(modifiedVirtualMeter) { modifiedVirtualMeter.energy_category_id = modifiedVirtualMeter.energy_category.id; - if(angular.isDefined(modifiedVirtualMeter.energy_item)) { + if (modifiedVirtualMeter.energy_item != null && modifiedVirtualMeter.energy_item.id != null ) { modifiedVirtualMeter.energy_item_id = modifiedVirtualMeter.energy_item.id; } else { modifiedVirtualMeter.energy_item_id = undefined;