You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2013/08/29 15:10:32 UTC
[1/2] git commit: AMBARI-3044 Ambari Suddenly Clears Entry For
Services/Components Configuration. (atkach)
Updated Branches:
refs/heads/trunk 4c2e398e0 -> 214e13211
AMBARI-3044 Ambari Suddenly Clears Entry For Services/Components Configuration. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/c8e2dec2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/c8e2dec2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/c8e2dec2
Branch: refs/heads/trunk
Commit: c8e2dec2fafb1215a5fa9cccc3a1060ade49cd22
Parents: 4c2e398
Author: atkach <an...@gmail.com>
Authored: Wed Aug 28 14:21:13 2013 +0300
Committer: atkach <an...@gmail.com>
Committed: Thu Aug 29 15:24:06 2013 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main.js | 6 ++++--
ambari-web/app/models/cluster_states.js | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c8e2dec2/ambari-web/app/controllers/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main.js b/ambari-web/app/controllers/main.js
index ec721af..6f2701f 100644
--- a/ambari-web/app/controllers/main.js
+++ b/ambari-web/app/controllers/main.js
@@ -89,9 +89,11 @@ App.MainController = Em.Controller.extend({
this.set('reloadTimeOut',
setTimeout(function () {
- location.reload()
+ if (App.clusterStatus.get('isInstalled')) {
+ location.reload();
+ }
}, App.pageReloadTime)
);
- }.observes("App.router.location.lastSetURL")
+ }.observes("App.router.location.lastSetURL", "App.clusterStatus.isInstalled")
})
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c8e2dec2/ambari-web/app/models/cluster_states.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/cluster_states.js b/ambari-web/app/models/cluster_states.js
index 14c0e90..081ba9d 100644
--- a/ambari-web/app/models/cluster_states.js
+++ b/ambari-web/app/models/cluster_states.js
@@ -28,6 +28,10 @@ App.clusterStatus = Ember.Object.create({
wizardControllerName: null,
localdb: null,
key: 'CLUSTER_CURRENT_STATUS',
+ isInstalled: function(){
+ var notInstalledStates = ['CLUSTER_NOT_CREATED_1', 'CLUSTER_DEPLOY_PREP_2', 'CLUSTER_INSTALLING_3', 'SERVICE_STARTING_3'];
+ return !notInstalledStates.contains(this.get('clusterState'));
+ }.property('clusterState'),
/**
* get cluster data from server and update cluster status
* @param isAsync: set this to true if the call is to be made asynchronously. if unspecified, false is assumed
[2/2] git commit: AMBARI-3050 Javascript error during WebHCat
start/stop. (atkach)
Posted by at...@apache.org.
AMBARI-3050 Javascript error during WebHCat start/stop. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/214e1321
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/214e1321
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/214e1321
Branch: refs/heads/trunk
Commit: 214e13211aff9f478b1cf49bd1e103b3c8ad679e
Parents: c8e2dec
Author: atkach <an...@gmail.com>
Authored: Thu Aug 29 16:09:18 2013 +0300
Committer: atkach <an...@gmail.com>
Committed: Thu Aug 29 16:09:18 2013 +0300
----------------------------------------------------------------------
ambari-web/app/templates/main/service/info/summary.hbs | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/214e1321/ambari-web/app/templates/main/service/info/summary.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/summary.hbs b/ambari-web/app/templates/main/service/info/summary.hbs
index c77492e..6875793 100644
--- a/ambari-web/app/templates/main/service/info/summary.hbs
+++ b/ambari-web/app/templates/main/service/info/summary.hbs
@@ -41,10 +41,9 @@
<table id="summary-info" class="table no-borders table-condensed">
<tbody>
{{#if view.noTemplateService}}
+ {{view view.sumMasterComponentView}}
{{#each component in view.components}}
- {{#if component.isMaster}}
- {{view view.sumMasterComponentView}}
- {{else}}
+ {{#unless component.isMaster}}
<tr>
<td class="summary-label">{{component.displayName}}{{#if view.hasManyClients}}s{{/if}}</td>
<td>
@@ -55,7 +54,7 @@
</div>
</td>
</tr>
- {{/if}}
+ {{/unless}}
{{/each}}
{{/if}}
{{#if view.serviceStatus.hdfs}}