seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed energy item undefined issue when edit virtual meter and offline meter

pull/1/head
13621160019@163.com 2021-02-27 12:52:27 +08:00
parent 143dd46aa2
commit f9eb2e39ba
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -11,7 +11,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- None. - None.
### Fixed ### 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 ### Removed
- None. - None.

2
admin/app/controllers/settings/meter/offline-meter.controller.js
View File

@ -133,7 +133,7 @@ app.controller('OfflineMeterController', function($scope, $common, $translate, $
modalInstance.result.then(function(modifiedOfflineMeter) { modalInstance.result.then(function(modifiedOfflineMeter) {
modifiedOfflineMeter.energy_category_id = modifiedOfflineMeter.energy_category.id; 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; modifiedOfflineMeter.energy_item_id = modifiedOfflineMeter.energy_item.id;
} else { } else {
modifiedOfflineMeter.energy_item_id = undefined; modifiedOfflineMeter.energy_item_id = undefined;

2
admin/app/controllers/settings/meter/virtual-meter.controller.js
View File

@ -159,7 +159,7 @@ $scope.getAllEnergyItems = function() {
modalInstance.result.then(function(modifiedVirtualMeter) { modalInstance.result.then(function(modifiedVirtualMeter) {
modifiedVirtualMeter.energy_category_id = modifiedVirtualMeter.energy_category.id; 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; modifiedVirtualMeter.energy_item_id = modifiedVirtualMeter.energy_item.id;
} else { } else {
modifiedVirtualMeter.energy_item_id = undefined; modifiedVirtualMeter.energy_item_id = undefined;