You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/04/10 17:41:56 UTC
[1/2] ambari git commit: AMBARI-10441. Alerts explanation text cannot
be seen in its entirety - should be wider/scrollable (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 3eba89a14 -> 3ae841a24
AMBARI-10441. Alerts explanation text cannot be seen in its entirety - should be wider/scrollable (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ae841a2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ae841a2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ae841a2
Branch: refs/heads/trunk
Commit: 3ae841a2494152d53a00dbf6487a966091d94ca6
Parents: 136b3b6
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Apr 10 18:27:00 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Apr 10 18:41:51 2015 +0300
----------------------------------------------------------------------
.../app/controllers/main/service/info/summary.js | 1 +
ambari-web/app/styles/alerts.less | 13 ++++++++++++-
.../main/service/info/service_alert_popup.hbs | 4 ++--
3 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ae841a2/ambari-web/app/controllers/main/service/info/summary.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/info/summary.js b/ambari-web/app/controllers/main/service/info/summary.js
index f25ad56..c4b9a53 100644
--- a/ambari-web/app/controllers/main/service/info/summary.js
+++ b/ambari-web/app/controllers/main/service/info/summary.js
@@ -252,6 +252,7 @@ App.MainServiceInfoSummaryController = Em.Controller.extend({
return App.ModalPopup.show({
header: Em.I18n.t('services.service.summary.alerts.popup.header').format(service.get('displayName')),
autoHeight: false,
+ classNames: [ 'forty-percent-width-modal' ],
bodyClass: Em.View.extend({
templateName: require('templates/main/service/info/service_alert_popup'),
classNames: ['service-alerts'],
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ae841a2/ambari-web/app/styles/alerts.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/alerts.less b/ambari-web/app/styles/alerts.less
index 6204e78..e6f0bbc 100644
--- a/ambari-web/app/styles/alerts.less
+++ b/ambari-web/app/styles/alerts.less
@@ -517,6 +517,17 @@
}
}
+.forty-percent-width-modal {
+ .modal {
+ width: 40%;
+
+ .definition-latest-text {
+ overflow-x: auto;
+ text-overflow: inherit;
+ white-space: nowrap;
+ }
+ }
+}
/*****end styles for manage alerts popup*****/
@@ -625,4 +636,4 @@
.enable-disable-button::before {
font-family: FontAwesome;
content: "\f011";
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ae841a2/ambari-web/app/templates/main/service/info/service_alert_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs
index 8090b59..730906f 100644
--- a/ambari-web/app/templates/main/service/info/service_alert_popup.hbs
+++ b/ambari-web/app/templates/main/service/info/service_alert_popup.hbs
@@ -21,7 +21,7 @@
{{#each alert in view.alerts}}
<li class="alert-list-wrap">
<div class="row-fluid">
- <div class="span7 name-text">
+ <div class="span8 name-text">
<div>
<a href="#" {{action "gotoAlertDetails" alert target="view"}}>{{alert.label}}</a>
</div>
@@ -29,7 +29,7 @@
{{alert.latestText}}
</div>
</div>
- <div class="span5 status-col" rel="alert-status-tooltip" >
+ <div class="span4 status-col" rel="alert-status-tooltip" >
<span class="timeago" {{bindAttr data-original-title="alert.lastTriggeredVerboseDisplay"}}>
<span class="status-icon">{{{alert.status}}}</span>
<time>{{alert.lastTriggeredForFormatted}}</time>
[2/2] ambari git commit: AMBARI-10440. Manual RU - Client-only
services need restart to advertise version (alexantonenko)
Posted by al...@apache.org.
AMBARI-10440. Manual RU - Client-only services need restart to advertise version (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/136b3b65
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/136b3b65
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/136b3b65
Branch: refs/heads/trunk
Commit: 136b3b65c0837dd2b163bf722091431b3f6cca41
Parents: 3eba89a
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri Apr 10 18:01:53 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri Apr 10 18:41:51 2015 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/host/details.js | 4 +---
ambari-web/app/models/host_component.js | 2 +-
ambari-web/app/templates/main/host/summary.hbs | 2 +-
.../test/controllers/main/host/details_test.js | 17 +++--------------
ambari-web/test/views/main/service/item_test.js | 2 +-
5 files changed, 7 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/136b3b65/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index 23b86bc..99fea74 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -1906,9 +1906,7 @@ App.MainHostDetailsController = Em.Controller.extend({
*/
refreshConfigs: function (event) {
var self = this;
- var components = event.context.filter(function (component) {
- return component.get('staleConfigs');
- });
+ var components = event.context;
if (components.get('length') > 0) {
return App.showConfirmationPopup(function () {
batchUtils.restartHostComponents(components, Em.I18n.t('rollingrestart.context.allClientsOnSelectedHost').format(self.get('content.hostName')), "HOST");
http://git-wip-us.apache.org/repos/asf/ambari/blob/136b3b65/ambari-web/app/models/host_component.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/host_component.js b/ambari-web/app/models/host_component.js
index bd4c69a..93804a3 100644
--- a/ambari-web/app/models/host_component.js
+++ b/ambari-web/app/models/host_component.js
@@ -245,7 +245,7 @@ App.HostComponentActionMap = {
action: 'refreshConfigs',
label: Em.I18n.t('hosts.host.details.refreshConfigs'),
cssClass: 'icon-refresh',
- disabled: !ctx.get('controller.content.isRestartRequired')
+ disabled: false
},
REFRESHQUEUES: {
action: 'refreshYarnQueues',
http://git-wip-us.apache.org/repos/asf/ambari/blob/136b3b65/ambari-web/app/templates/main/host/summary.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/host/summary.hbs b/ambari-web/app/templates/main/host/summary.hbs
index 3d72c2f..31df85d 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -86,7 +86,7 @@
</button>
<ul class="dropdown-menu">
<li>
- <a href="javascript:void(null)" {{bindAttr class="view.areClientWithStaleConfigs::disabled"}} data-toggle="modal" {{action refreshConfigs view.clients target="controller"}}>
+ <a href="javascript:void(null)" data-toggle="modal" {{action refreshConfigs view.clients target="controller"}}>
{{t hosts.host.details.refreshConfigs}}
</a>
</li>
http://git-wip-us.apache.org/repos/asf/ambari/blob/136b3b65/ambari-web/test/controllers/main/host/details_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/host/details_test.js b/ambari-web/test/controllers/main/host/details_test.js
index 19a160b..84545d0 100644
--- a/ambari-web/test/controllers/main/host/details_test.js
+++ b/ambari-web/test/controllers/main/host/details_test.js
@@ -1796,23 +1796,12 @@ describe('App.MainHostDetailsController', function () {
controller.refreshConfigs(event);
expect(App.showConfirmationPopup.called).to.be.false;
});
- it('No components with stale configs', function () {
- var event = {context: [Em.Object.create({
- staleConfigs: false
- })]};
- controller.refreshConfigs(event);
- expect(App.showConfirmationPopup.called).to.be.false;
- });
- it('Components with stale configs', function () {
- var event = {context: [Em.Object.create({
- staleConfigs: true
- })]};
+ it('Some components present', function () {
+ var event = {context: [Em.Object.create()]};
var popup = controller.refreshConfigs(event);
expect(App.showConfirmationPopup.calledOnce).to.be.true;
popup.onPrimary();
- expect(batchUtils.restartHostComponents.calledWith([Em.Object.create({
- staleConfigs: true
- })])).to.be.true;
+ expect(batchUtils.restartHostComponents.calledWith([Em.Object.create()])).to.be.true;
});
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/136b3b65/ambari-web/test/views/main/service/item_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/service/item_test.js b/ambari-web/test/views/main/service/item_test.js
index 62e4814..4805004 100644
--- a/ambari-web/test/views/main/service/item_test.js
+++ b/ambari-web/test/views/main/service/item_test.js
@@ -248,7 +248,7 @@ describe('App.MainServiceItemView', function () {
{'isAddDisabled-FLUME_HANDLER': ''}
],
result: [
- {"action": "refreshConfigs", "label": "Refresh configs", "cssClass": "icon-refresh", "disabled": true},
+ {"action": "refreshConfigs", "label": "Refresh configs", "cssClass": "icon-refresh", "disabled": false},
{"action": "restartAllHostComponents", "context": "FLUME", "label": "Restart All", "cssClass": "icon-repeat", "disabled": false},
{"action": "rollingRestart", "label": "Restart Flumes", "cssClass": "icon-time", "disabled": false, "context": "FLUME_HANDLER"},
{"action": "runSmokeTest", "label": "Run Service Check", "cssClass": "icon-thumbs-up-alt", "disabled": false},