You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xk...@apache.org on 2018/09/20 20:30:13 UTC
[05/50] [abbrv] hadoop git commit: YARN-8652. [UI2] YARN UI2 breaks
if getUserInfo REST API is not available in older versions. Contributed by
Akhil PB.
YARN-8652. [UI2] YARN UI2 breaks if getUserInfo REST API is not available in older versions. Contributed by Akhil PB.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bbeca010
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bbeca010
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bbeca010
Branch: refs/heads/HDFS-12943
Commit: bbeca0107e247ae14cfe96761f9e5fbb1f02e53d
Parents: 0cc6e03
Author: Sunil G <su...@apache.org>
Authored: Tue Sep 18 12:44:21 2018 +0530
Committer: Sunil G <su...@apache.org>
Committed: Tue Sep 18 12:44:21 2018 +0530
----------------------------------------------------------------------
.../src/main/webapp/app/controllers/application.js | 5 ++++-
.../hadoop-yarn-ui/src/main/webapp/app/routes/application.js | 4 +++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbeca010/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
index 75b072a..3e8fcce 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/controllers/application.js
@@ -65,6 +65,9 @@ export default Ember.Controller.extend({
}.property('model.clusterInfo'),
userInfo: function() {
- return this.model.userInfo.get('firstObject');
+ if (this.model.userInfo) {
+ return this.model.userInfo.get('firstObject');
+ }
+ return null;
}.property('model.userInfo'),
});
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bbeca010/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
index e30baaa..60d1efd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-ui/src/main/webapp/app/routes/application.js
@@ -23,7 +23,9 @@ export default AbstractRoute.extend({
model() {
return Ember.RSVP.hash({
clusterInfo: this.store.findAll('ClusterInfo', {reload: true}),
- userInfo: this.store.findAll('cluster-user-info', {reload: true})
+ userInfo: this.store.findAll('cluster-user-info', {reload: true}).catch(function() {
+ return null;
+ })
});
},
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org