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 2016/05/12 11:29:41 UTC
[1/2] ambari git commit: AMBARI-16436. Unauthorized user can get
access to admin pages by pointing to their URLs. Additional fix for mistype.
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 270a80989 -> 56f4c618a
AMBARI-16436. Unauthorized user can get access to admin pages by pointing to their URLs. Additional fix for mistype. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/56f4c618
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/56f4c618
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/56f4c618
Branch: refs/heads/trunk
Commit: 56f4c618a7fa6cfc714e429e73d468788740352f
Parents: 0a0009a
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu May 12 13:24:28 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu May 12 14:29:36 2016 +0300
----------------------------------------------------------------------
ambari-web/app/routes/main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/56f4c618/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index 5cf68d0..fba3410 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -527,7 +527,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
adminServiceAccounts: Em.Route.extend({
route: '/serviceAccounts',
enter: function (router, transition) {
- if (router.get('loggedIn') && !App.isAuthorized('AMBARI.SET_SERVICE_USERS_GROUP')) {
+ if (router.get('loggedIn') && !App.isAuthorized('AMBARI.SET_SERVICE_USERS_GROUPS')) {
router.transitionTo('main.dashboard.index');
}
},
[2/2] ambari git commit: AMBARI-16633. 'Download CSV' button in Add
Service Wizard is not performing any action (alexantonenko)
Posted by al...@apache.org.
AMBARI-16633. 'Download CSV' button in Add Service Wizard is not performing any action (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a0009a9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a0009a9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a0009a9
Branch: refs/heads/trunk
Commit: 0a0009a97defb12db9d9a5c75bc73388154bfd7f
Parents: 270a809
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu May 12 13:05:35 2016 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu May 12 14:29:36 2016 +0300
----------------------------------------------------------------------
ambari-web/app/controllers/wizard/step8_controller.js | 4 ++++
ambari-web/app/templates/wizard/step8.hbs | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a0009a9/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index ee98bf5..c0356a0 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1744,5 +1744,9 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
})
});
+ },
+
+ downloadCSV: function() {
+ App.router.get('kerberosWizardStep5Controller').getCSVData(false);
}
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a0009a9/ambari-web/app/templates/wizard/step8.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step8.hbs b/ambari-web/app/templates/wizard/step8.hbs
index f19e020..856ddeb 100644
--- a/ambari-web/app/templates/wizard/step8.hbs
+++ b/ambari-web/app/templates/wizard/step8.hbs
@@ -82,6 +82,6 @@
<a class="btn btn-success pull-right"
id="spinner" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action submit target="controller"}}>{{t common.deploy}} →</a>
<a class="btn btn-info pull-right" {{action printReview target="view"}}>{{t common.print}}</a>
- <a {{bindAttr class=":btn :btn-primary :pull-right :mrm controller.showDownloadCsv::hide"}} {{action downloadCSV target="App.router.kerberosWizardStep5Controller"}}>{{t admin.kerberos.wizard.step5.downloadCSV}}</a>
+ <a {{bindAttr class=":btn :btn-primary :pull-right :mrm controller.showDownloadCsv::hide"}} {{action downloadCSV target="controller"}}>{{t admin.kerberos.wizard.step5.downloadCSV}}</a>
</div>
</div>