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/11/23 13:49:21 UTC
ambari git commit: AMBARI-14012. After upgrade,
Ambari UI does not show versions tab
Repository: ambari
Updated Branches:
refs/heads/trunk c71a1016d -> b639de038
AMBARI-14012. After upgrade, Ambari UI does not show versions tab
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b639de03
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b639de03
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b639de03
Branch: refs/heads/trunk
Commit: b639de0383304077daf0ae192bc705002dee527d
Parents: c71a101
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Nov 23 14:41:24 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Nov 23 14:49:17 2015 +0200
----------------------------------------------------------------------
.../app/views/main/admin/stack_upgrade/services_view.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b639de03/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
index 75598a0..df0a05a 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/services_view.js
@@ -39,6 +39,9 @@ App.MainAdminStackServicesView = Em.View.extend({
didInsertElement: function () {
if (!App.get('stackVersionsAvailable')) {
+ this.get('controller').loadStackVersionsToModel(true).done(function () {
+ App.set('stackVersionsAvailable', App.StackVersion.find().content.length > 0);
+ });
this.get('controller').loadRepositories();
}
},
@@ -88,7 +91,7 @@ App.MainAdminStackServicesView = Em.View.extend({
});
var cur_group = reposGroup.findProperty('name', group.name);
if (!cur_group) {
- var cur_group = Ember.Object.create({
+ cur_group = Ember.Object.create({
name: group.name,
repositories: []
});
@@ -149,7 +152,7 @@ App.MainAdminStackServicesView = Em.View.extend({
* Handler when editing any repo group BaseUrl
* @method editGroupLocalRepository
*/
- editGroupLocalRepository: function (event) {
+ editGroupLocalRepository: function () {
var repos = this.get('allRepos');
repos.forEach(function (targetRepo) {
targetRepo.set('undo', targetRepo.get('baseUrl') != targetRepo.get('originalBaseUrl'));
@@ -196,9 +199,7 @@ App.MainAdminStackServicesView = Em.View.extend({
var self = this;
var id = data.url.split('/')[10] + '-' + data.url.split('/')[8];
var targetRepo = this.get('allRepos').findProperty('id', id);
- if (!targetRepo) {
- return;
- } else {
+ if (targetRepo) {
App.ModalPopup.show({
header: Em.I18n.t('admin.cluster.repositories.popup.header.fail'),
primary: Em.I18n.t('common.saveAnyway'),
@@ -232,7 +233,6 @@ App.MainAdminStackServicesView = Em.View.extend({
*/
doSaveRepoUrls: function (id, verifyBaseUrl) {
var targetRepo = this.get('allRepos').findProperty('id', id);
- var verifyBaseUrl = verifyBaseUrl;
App.ajax.send({
name: 'wizard.advanced_repositories.valid_url',
sender: this,