eagle-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject incubator-eagle git commit: EAGLE-210 UI application group not display correctly field of ApplicationDesc has changed from 'group' to 'groupName'. Need update UI also
Date Tue, 29 Mar 2016 04:41:14 GMT
Repository: incubator-eagle
Updated Branches:
  refs/heads/master 57aa3d3ac -> c2c187789


EAGLE-210 UI application group not display correctly
field of ApplicationDesc has changed from 'group' to 'groupName'. Need update UI also

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

Author: @zombiej
Reviewer: @haoch

Closes #133


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

Branch: refs/heads/master
Commit: c2c187789270b3559b1cccb3c9a7dd9ef655dc14
Parents: 57aa3d3
Author: jiljiang <jiljiang@ebay.com>
Authored: Tue Mar 29 12:41:03 2016 +0800
Committer: jiljiang <jiljiang@ebay.com>
Committed: Tue Mar 29 12:41:03 2016 +0800

----------------------------------------------------------------------
 eagle-webservice/src/main/webapp/app/index.html                  | 2 +-
 .../src/main/webapp/app/partials/config/application.html         | 2 +-
 .../src/main/webapp/app/public/js/srv/applicationSrv.js          | 4 ++--
 eagle-webservice/src/main/webapp/app/public/js/srv/siteSrv.js    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/c2c18778/eagle-webservice/src/main/webapp/app/index.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/index.html b/eagle-webservice/src/main/webapp/app/index.html
index c096b21..7cd3e25 100644
--- a/eagle-webservice/src/main/webapp/app/index.html
+++ b/eagle-webservice/src/main/webapp/app/index.html
@@ -170,7 +170,7 @@
 				<section class="sidebar">
 					<ul class="sidebar-menu">
 						<li class="header">
-							{{Application.current().groupName || 'Application'}} >
+							{{Application.current().group || 'Application'}} >
 							{{Application.current().displayName || 'Features'}}
 						</li>
 						<li ng-repeat="page in PageConfig.navConfig.pageList track by $index" ng-class="getNavClass(page)"
ng-show="getNavVisible(page)">

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/c2c18778/eagle-webservice/src/main/webapp/app/partials/config/application.html
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/partials/config/application.html b/eagle-webservice/src/main/webapp/app/partials/config/application.html
index 95add15..0bf194c 100644
--- a/eagle-webservice/src/main/webapp/app/partials/config/application.html
+++ b/eagle-webservice/src/main/webapp/app/partials/config/application.html
@@ -69,7 +69,7 @@
 				</div>
 				<div class="form-group">
 					<label for="applicationGroup">Group</label>
-					<input type="text" class="form-control" id="applicationGroup" placeholder="(Optional)
Group name" ng-model="applications[application.tags.application].group">
+					<input type="text" class="form-control" id="applicationGroup" placeholder="(Optional)
Group name" ng-model="applications[application.tags.application].groupName">
 				</div>
 				<div class="form-group">
 					<label for="applicationDescription">Description</label>

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/c2c18778/eagle-webservice/src/main/webapp/app/public/js/srv/applicationSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/public/js/srv/applicationSrv.js b/eagle-webservice/src/main/webapp/app/public/js/srv/applicationSrv.js
index 2c9e0b6..d911194 100644
--- a/eagle-webservice/src/main/webapp/app/public/js/srv/applicationSrv.js
+++ b/eagle-webservice/src/main/webapp/app/public/js/srv/applicationSrv.js
@@ -123,9 +123,9 @@
 								}
 							},
 							// Get format group name. Will mark as 'Others' if no group defined
-							groupName: {
+							group: {
 								get: function () {
-									return this.group || "Others";
+									return this.groupName || "Others";
 								}
 							},
 							configObj: {

http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/c2c18778/eagle-webservice/src/main/webapp/app/public/js/srv/siteSrv.js
----------------------------------------------------------------------
diff --git a/eagle-webservice/src/main/webapp/app/public/js/srv/siteSrv.js b/eagle-webservice/src/main/webapp/app/public/js/srv/siteSrv.js
index 907915d..c97e9a1 100644
--- a/eagle-webservice/src/main/webapp/app/public/js/srv/siteSrv.js
+++ b/eagle-webservice/src/main/webapp/app/public/js/srv/siteSrv.js
@@ -142,7 +142,7 @@
 						_site.applicationList.push(siteApplication);
 						_site.applicationList.set[siteApplication.tags.application] = siteApplication;
 
-						_appGroup = _site.applicationGroup[_application.groupName] = _site.applicationGroup[_application.groupName]
|| [];
+						_appGroup = _site.applicationGroup[_application.group] = _site.applicationGroup[_application.group]
|| [];
 						_appGroup.push(_application);
 					}
 				});


Mime
View raw message