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 2014/07/08 15:12:52 UTC
git commit: AMBARI-6414. need ability to retry repos (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 84e13aabd -> b69f06e00
AMBARI-6414. need ability to retry repos (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b69f06e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b69f06e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b69f06e0
Branch: refs/heads/trunk
Commit: b69f06e00570c60785b274c7637108c699d125f0
Parents: 84e13aa
Author: Alex Antonenko <hi...@gmail.com>
Authored: Tue Jul 8 15:53:52 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Tue Jul 8 15:53:52 2014 +0300
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 +
ambari-web/app/templates/wizard/step1.hbs | 5 ++++-
ambari-web/app/views/wizard/step1_view.js | 7 +++++++
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b69f06e0/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index fd25d8a..94a8c62 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -379,6 +379,7 @@ Em.I18n.translations = {
'installer.step1.attentionNeeded':'<b>Attention:</b> Repository URLs are REQUIRED before you can proceed.',
'installer.step1.invalidURLAttention': '<b>Attention:</b> Please make sure all repository URLs are valid before proceeding.',
'installer.step1.checkAtLeastOneAttention': '<b>Attention:</b> Please check at least one repository.',
+ 'installer.step1.retryRepoUrls': 'Click <b>here</b> to retry.',
'installer.step2.header':'Install Options',
'installer.step2.body':'Enter the list of hosts to be included in the cluster and provide your SSH key.',
http://git-wip-us.apache.org/repos/asf/ambari/blob/b69f06e0/ambari-web/app/templates/wizard/step1.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step1.hbs b/ambari-web/app/templates/wizard/step1.hbs
index eb3bbe3..d13922a 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -102,7 +102,10 @@
<div class="alert">{{t installer.step1.attentionNeeded}}</div>
{{/if}}
{{#if view.invalidUrlExist}}
- <div class="alert">{{t installer.step1.invalidURLAttention}}</div>
+ <div class="alert">
+ {{t installer.step1.invalidURLAttention}}
+ <a href="javascript:void(null)" {{action "retryRepoUrls" target="view"}}>{{t installer.step1.retryRepoUrls}}</a>
+ </div>
{{/if}}
{{#if view.allRepoUnchecked}}
<div class="alert">{{t installer.step1.checkAtLeastOneAttention}}</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b69f06e0/ambari-web/app/views/wizard/step1_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/wizard/step1_view.js b/ambari-web/app/views/wizard/step1_view.js
index 4ab2121..9fe3120 100644
--- a/ambari-web/app/views/wizard/step1_view.js
+++ b/ambari-web/app/views/wizard/step1_view.js
@@ -172,6 +172,13 @@ App.WizardStep1View = Em.View.extend({
},
/**
+ * Onclick handler for recheck repos urls. Used in Advanced Repository Options.
+ */
+ retryRepoUrls: function () {
+ App.router.get('installerController').checkRepoURL();
+ },
+
+ /**
* Format repo values and set it to <code>allRepositories</code>
* @method loadRepositories
*/