Merge branch 'develop'

CHANGELOG.md

@@ -9,7 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 - updated Distribution System in myems-web
 ### Fixed
--
+- fixed issues of optional svg textarea for equipment and combined equipment in myems-admin 
 ### Removed
 -
 

myems-admin/views/settings/combinedequipment/combinedequipment.model.html

@@ -40,10 +40,7 @@
             </div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.SVG' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-9">
-                    <textarea ng-model="combinedequipment.svg" rows="10" cols="50" name="combinedequipmentsvg" class="form-control" required="" placeholder="<svg></svg>"></textarea>
-                    <div class="m-t-xs" ng-show="form_combinedequipment.combinedequipmentsvg.$invalid && form_combinedequipment.combinedequipmentsvg.$dirty">
-                        <small class="text-danger" ng-show="form_combinedequipment.combinedequipmentsvg.$error.required">{{'COMBINED_EQUIPMENT.INPUT_SVG' | translate}}</small>
-                    </div>
+                    <textarea ng-model="combinedequipment.svg" rows="10" cols="50" name="combinedequipmentsvg" class="form-control" placeholder="<svg></svg>"></textarea>
                 </div>
             </div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'COMBINED_EQUIPMENT.CAMERA_URL' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>

myems-admin/views/settings/equipment/equipment.model.html

@@ -40,10 +40,7 @@
             </div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.SVG' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>
                 <div class="col-sm-9">
-                    <textarea ng-model="equipment.svg" rows="10" cols="50" name="equipmentsvg" class="form-control" required="" placeholder="<svg></svg>"></textarea>
-                    <div class="m-t-xs" ng-show="form_equipment.equipmentsvg.$invalid && form_equipment.equipmentsvg.$dirty">
-                        <small class="text-danger" ng-show="form_equipment.equipmentsvg.$error.required">{{'EQUIPMENT.INPUT_SVG' | translate}}</small>
-                    </div>
+                    <textarea ng-model="equipment.svg" rows="10" cols="50" name="equipmentsvg" class="form-control" placeholder="<svg></svg>"></textarea>
                 </div>
             </div>
             <div class="form-group"><label class="col-sm-3 control-label">{{'EQUIPMENT.CAMERA_URL' | translate}} ({{'SETTING.OPTIONAL' | translate}})</label>