You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/02/17 13:13:30 UTC
[1/2] git commit: AMBARI-4694 Preserve active tab (Summary or
Configs) when navigating across services. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 95796b832 -> 5cd82eb23
AMBARI-4694 Preserve active tab (Summary or Configs) when navigating across services. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cb9a6f38
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb9a6f38
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb9a6f38
Branch: refs/heads/trunk
Commit: cb9a6f3803ef67af3904580a565e31e1e52cb436
Parents: 95796b8
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Feb 17 14:05:23 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Feb 17 14:06:22 2014 +0200
----------------------------------------------------------------------
ambari-web/app/templates/main/service/menu_item.hbs | 2 +-
ambari-web/app/views/main/service/menu.js | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb9a6f38/ambari-web/app/templates/main/service/menu_item.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/menu_item.hbs b/ambari-web/app/templates/main/service/menu_item.hbs
index 1adb8e5..1d9d710 100644
--- a/ambari-web/app/templates/main/service/menu_item.hbs
+++ b/ambari-web/app/templates/main/service/menu_item.hbs
@@ -16,7 +16,7 @@
* limitations under the License.
}}
-<a href="#/main/services/{{unbound view.content.id}}/summary">
+<a {{bindAttr href="view.link"}}>
{{view App.MainDashboardServiceHealthView class="service-health" serviceBinding="view.content"}}
<span>{{unbound view.content.displayName}}</span>
{{#if view.alertsCount}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb9a6f38/ambari-web/app/views/main/service/menu.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/menu.js b/ambari-web/app/views/main/service/menu.js
index 1a95192..795781b 100644
--- a/ambari-web/app/views/main/service/menu.js
+++ b/ambari-web/app/views/main/service/menu.js
@@ -73,6 +73,10 @@ App.MainServiceMenuView = Em.CollectionView.extend({
return this.get('content.criticalAlertsCount');
}.property('content.criticalAlertsCount'),
+ link: function() {
+ return "#/main/services/" + this.get('content.id') + "/" + App.router.get('currentState.name');
+ }.property('App.router.currentState.name'),
+
refreshRestartRequiredMessage: function() {
var restarted, componentsCount, hostsCount, message, tHosts, tComponents;
restarted = this.get('content.restartRequiredHostsAndComponents');
[2/2] git commit: AMBARI-4695 When in Decommissioned" state and Maint,
icon shows orange, not medbag. (ababiichuk)
Posted by ab...@apache.org.
AMBARI-4695 When in Decommissioned" state and Maint, icon shows orange, not medbag. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5cd82eb2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5cd82eb2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5cd82eb2
Branch: refs/heads/trunk
Commit: 5cd82eb233ebf65876e5469677ff304732a7278f
Parents: cb9a6f3
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Feb 17 14:06:04 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Feb 17 14:06:23 2014 +0200
----------------------------------------------------------------------
.../main/host/details/host_component_view.js | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5cd82eb2/ambari-web/app/views/main/host/details/host_component_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/host/details/host_component_view.js b/ambari-web/app/views/main/host/details/host_component_view.js
index cedfa79..8b26434 100644
--- a/ambari-web/app/views/main/host/details/host_component_view.js
+++ b/ambari-web/app/views/main/host/details/host_component_view.js
@@ -128,6 +128,21 @@ App.HostComponentView = Em.View.extend({
* @type {String}
*/
statusClass: function () {
+ //Class when install failed
+ if (this.get('workStatus') === App.HostComponentStatus.install_failed) {
+ return 'health-status-color-red icon-cog';
+ }
+
+ //Class when installing
+ if (this.get('workStatus') === App.HostComponentStatus.installing) {
+ return 'health-status-color-blue icon-cog';
+ }
+
+ //Class when maintenance
+ if (this.get('content.passiveState') != "ACTIVE") {
+ return 'icon-medkit';
+ }
+
//If the component is DataNode
if (this.get('isDataNode')) {
if (this.get('isDataNodeRecommissionAvailable') && (this.get('isStart') || this.get('workStatus') == 'INSTALLED')) {
@@ -156,21 +171,6 @@ App.HostComponentView = Em.View.extend({
}
}
- //Class when install failed
- if (this.get('workStatus') === App.HostComponentStatus.install_failed) {
- return 'health-status-color-red icon-cog';
- }
-
- //Class when installing
- if (this.get('workStatus') === App.HostComponentStatus.installing) {
- return 'health-status-color-blue icon-cog';
- }
-
- //Class when maintenance
- if (this.get('content.passiveState') != "ACTIVE") {
- return 'icon-medkit';
- }
-
//For all other cases
return 'health-status-' + App.HostComponentStatus.getKeyName(this.get('workStatus'));