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 2013/09/18 16:58:38 UTC
[1/2] git commit: AMBARI-3269. Incorrect indication of paging for
"Jobs" page. (onechiporenko)
Updated Branches:
refs/heads/trunk 82d4a5438 -> 0d4472917
AMBARI-3269. Incorrect indication of paging for "Jobs" page. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/f061d451
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/f061d451
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/f061d451
Branch: refs/heads/trunk
Commit: f061d4517c364902c1c530b02a10e90a02949c8f
Parents: 82d4a54
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Wed Sep 18 17:52:49 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Wed Sep 18 17:58:28 2013 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/main/apps_controller.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/f061d451/ambari-web/app/controllers/main/apps_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/apps_controller.js b/ambari-web/app/controllers/main/apps_controller.js
index 658008a..c563200 100644
--- a/ambari-web/app/controllers/main/apps_controller.js
+++ b/ambari-web/app/controllers/main/apps_controller.js
@@ -66,10 +66,10 @@ App.MainAppsController = Em.ArrayController.extend({
//Pagination Object
paginationObject:{
- iTotalDisplayRecords :null,
- iTotalRecords:null,
- startIndex:null,
- endIndex:null
+ iTotalDisplayRecords :0,
+ iTotalRecords:0,
+ startIndex:0,
+ endIndex:0
},
/*
[2/2] git commit: AMBARI-3268. The help bubbles for conf. parameters
on "Customize Services" page have confusing info. (onechiporenko)
Posted by on...@apache.org.
AMBARI-3268. The help bubbles for conf. parameters on "Customize Services" page have confusing info. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/0d447291
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/0d447291
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/0d447291
Branch: refs/heads/trunk
Commit: 0d447291714b39316a2d8e250c03765d73b9eb39
Parents: f061d45
Author: Oleg Nechiporenko <cv...@yahoo.com>
Authored: Wed Sep 18 17:54:41 2013 +0300
Committer: Oleg Nechiporenko <cv...@yahoo.com>
Committed: Wed Sep 18 17:58:29 2013 +0300
----------------------------------------------------------------------
ambari-web/app/views/wizard/controls_view.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/0d447291/ambari-web/app/views/wizard/controls_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/controls_view.js b/ambari-web/app/views/wizard/controls_view.js
index 975744f..ad48cfb 100644
--- a/ambari-web/app/views/wizard/controls_view.js
+++ b/ambari-web/app/views/wizard/controls_view.js
@@ -34,7 +34,10 @@ App.ServiceConfigPopoverSupport = Ember.Mixin.create({
didInsertElement: function () {
if (this.get('isPopoverEnabled') !== 'false') {
App.popover(this.$(), {
- title: Em.I18n.t('installer.controls.serviceConfigPopover.title').format(this.get('serviceConfig.displayName'), this.get('serviceConfig.name')),
+ title: Em.I18n.t('installer.controls.serviceConfigPopover.title').format(
+ this.get('serviceConfig.displayName'),
+ (this.get('serviceConfig.displayName') == this.get('serviceConfig.name'))?'':this.get('serviceConfig.name')
+ ),
content: this.get('serviceConfig.description'),
placement: 'right',
trigger: 'hover'