Merge branch 'develop'

CHANGELOG.md

@@ -25,6 +25,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - fixed non-standard actions of microgrid in myems-api and myems-admin
 - fixed empty qrcode issue when creating objects in myems-admin
 - upgraded Font Awesome to v4.7.0 in myems-admin
+- fixed api key save button issue in myems-admin
 ### Removed
 -
 

myems-admin/app/controllers/users/apikey/apikey.controller.js

@@ -1,6 +1,7 @@
 'use strict';
 app.controller('ApiKeyController', function (
     $scope,
+	$rootScope,
 	$window,
 	$uibModal,
 	ApiKeyService,
@@ -49,6 +50,7 @@ app.controller('ApiKeyController', function (
 		}, function () {
 
 		});
+		$rootScope.modalInstance = modalInstance;
 	};
 
 	$scope.editApiKey = function (apiKey) {
@@ -87,6 +89,7 @@ app.controller('ApiKeyController', function (
 		}, function () {
 			//do nothing;
 		});
+		$rootScope.modalInstance = modalInstance;
 	};
 
 	$scope.deleteApiKey = function (apiKey) {
@@ -127,10 +130,16 @@ app.controller('ApiKeyController', function (
 	};
 
 	$scope.getAllApiKeys();
-
 });
 
 app.controller('ModalAddApiKeyCtrl', function ($scope, $uibModalInstance) {
+	$scope.isButtonDisabled = function() {
+		if ($scope.apiKey.name && $scope.apiKey.expires_datetime_utc > $scope.apiKey.created_datetime_utc) {
+			return false;
+		} else {
+			return true;
+		}
+	};
 	$scope.operation = "USER.ADD_API_KEY";
 	$scope.apiKey = {
 		created_datetime_utc:moment(),
@@ -162,6 +171,13 @@ app.controller('ModalAddApiKeyCtrl', function ($scope, $uibModalInstance) {
 app.controller('ModalEditApiKeyCtrl', function ($scope, 
 	$uibModalInstance, 
 	params) {
+	$scope.isButtonDisabled = function() {
+		if ($scope.apiKey.name && $scope.apiKey.expires_datetime_utc > $scope.apiKey.created_datetime_utc) {
+			return false;
+		} else {
+			return true;
+		}
+	};
 	$scope.operation = "USER.EDIT_API_KEY";
 	$scope.apiKey = params.apiKey;
 	$scope.flag = false;

myems-admin/views/users/apikey/apikey.model.html

@@ -43,6 +43,6 @@ <h4 class="modal-title">{{operation | translate}}(ID:{{apiKey.id}})</h4>
     <div class="modal-footer">
         <button type="button" class="btn btn-white" ng-click="cancel()">{{'SETTING.CANCEL' | translate}}</button>
         <button type="button" class="btn btn-primary"
-            ng-click="ok()">{{'SETTING.SAVE' | translate}}</button>
+            ng-click="ok()" ng-disabled="isButtonDisabled()">{{'SETTING.SAVE' | translate}}</button>
     </div>
 </div>