You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by on...@apache.org on 2014/05/20 15:30:47 UTC
git commit: AMBARI-5828. Slider Apps view UI should show warning
messages for invalid environments. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk fa6fa2842 -> 67c507014
AMBARI-5828. Slider Apps view UI should show warning messages for invalid environments. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/67c50701
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67c50701
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67c50701
Branch: refs/heads/trunk
Commit: 67c5070149b73c2867b5344687345a275bdb49b2
Parents: fa6fa28
Author: Oleg Nechiporenko <on...@apache.org>
Authored: Tue May 20 16:27:11 2014 +0300
Committer: Oleg Nechiporenko <on...@apache.org>
Committed: Tue May 20 16:30:40 2014 +0300
----------------------------------------------------------------------
.../resources/ui/app/assets/data/resource/status_false.json | 3 ++-
contrib/views/slider/src/main/resources/ui/app/initialize.js | 2 +-
.../src/main/resources/ui/app/templates/application.hbs | 8 +++++++-
3 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/67c50701/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/status_false.json
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/status_false.json b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/status_false.json
index 2fc22dc..62a4354 100644
--- a/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/status_false.json
+++ b/contrib/views/slider/src/main/resources/ui/app/assets/data/resource/status_false.json
@@ -2,6 +2,7 @@
"version": "0.0.1-SNAPSHOT",
"viewEnabled": false,
"viewErrors": [
- "Slider applications view requires HDFS service to be started"
+ "Slider applications view requires HDFS service to be started",
+ "Slider applications view requires YARN, HDFS and ZooKeeper services to bestarted."
]
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/67c50701/contrib/views/slider/src/main/resources/ui/app/initialize.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/initialize.js b/contrib/views/slider/src/main/resources/ui/app/initialize.js
index 1d67664..4df4dfc 100755
--- a/contrib/views/slider/src/main/resources/ui/app/initialize.js
+++ b/contrib/views/slider/src/main/resources/ui/app/initialize.js
@@ -72,7 +72,7 @@ App.initializer({
* Should Slider View be enabled
* @type {bool}
*/
- viewEnabled: true,
+ viewEnabled: false,
/**
* List of errors
http://git-wip-us.apache.org/repos/asf/ambari/blob/67c50701/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
index b776fd2..8285573 100755
--- a/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
+++ b/contrib/views/slider/src/main/resources/ui/app/templates/application.hbs
@@ -16,4 +16,10 @@
* limitations under the License.
}}
-{{outlet}}
+{{#if App.viewEnabled}}
+ {{outlet}}
+{{else}}
+ {{#each error in App.viewErrors}}
+ <h3>{{error}}</h3>
+ {{/each}}
+{{/if}}