Merge branch 'develop'

MyEMS · May 27, 2023 · c0cb032 · c0cb032
2 parents 0586455 + 0f4d3b1
commit c0cb032
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - fixed HTTPError Deprecated Warning in myems-api
 - fixed edit user issue in myems-api
+- fixed save button issue of energy item dialog in myems-admin
 
 ### Removed
 

diff --git a/myems-admin/views/settings/category/energyitem.model.html b/myems-admin/views/settings/category/energyitem.model.html
@@ -3,7 +3,7 @@
         <h4 class="modal-title">{{operation | translate}}(ID:{{energyItem.id}})</h4>
     </div>
     <div class="modal-body">
-        <form role="form" name="form_energy_item" novalidate class="form-horizontal">
+        <form role="form" name="form_energyitem" novalidate class="form-horizontal">
             <div class="form-group"><label class="col-sm-3 control-label">{{'SETTING.NAME' | translate}}</label>
 
                 <div class="col-sm-9"><input ng-model="energyItem.name" type="text" name="energyitemname" class="form-control" required="">

diff --git a/myems-api/test-mqtt.py → myems-api/test_mqtt.py b/myems-api/test-mqtt.py → myems-api/test_mqtt.py