eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From qingwz...@apache.org
Subject incubator-eagle git commit: EAGLE-212 Disable JSON format check
Date Fri, 08 Apr 2016 06:39:27 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/master 48ac798da -> f6aebe631


EAGLE-212 Disable JSON format check

https://issues.apache.org/jira/browse/EAGLE-212

Author: Zhao, Qingwen <qingwzhao@ebay.com>
Date:   Tue Mar 29 16:31:04 2016 +0800
Reviewer: Chen, Hao
Closes #138


Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/f6aebe63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/f6aebe63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/f6aebe63

Branch: refs/heads/master
Commit: f6aebe631c20685674c0d5c57b29c0ff257ddcc8
Parents: 48ac798
Author: Zhao, Qingwen <qingwzhao@ebay.com>
Authored: Fri Apr 8 14:36:22 2016 +0800
Committer: Zhao, Qingwen <qingwzhao@ebay.com>
Committed: Fri Apr 8 14:36:22 2016 +0800

----------------------------------------------------------------------
 .../main/webapp/app/public/js/ctrl/configurationController.js  | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/f6aebe63/eagle-webservice/src/main/webapp/app/public/js/ctrl/configurationController.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/public/js/ctrl/configurationController.js
b/eagle-webservice/src/main/webapp/app/public/js/ctrl/configurationController.js
index 4841f11..300c6fd 100644
--- a/eagle-webservice/src/main/webapp/app/public/js/ctrl/configurationController.js
+++ b/eagle-webservice/src/main/webapp/app/public/js/ctrl/configurationController.js
@@ -342,11 +342,7 @@
 			var _oriConfig = application.config;
 			UI.updateConfirm("Application", {config: _oriConfig}, [
 				{name: "Configuration", field: "config", type: "blob"}
-			], function(entity) {
-				if(entity.config !== "" && !common.parseJSON(entity.config, false)) {
-					return "Invalid JSON format";
-				}
-			}).then(null, null, function(holder) {
+			]).then(null, null, function(holder) {
 				application.config = holder.entity.config;
 				holder.closeFunc();
 				if(_oriConfig !== application.config) $scope.changed = true;


Mime
View raw message