Repository: ambari Updated Branches: refs/heads/trunk 6016fc6e8 -> 41bdc34d5
AMBARI-11024. Kerberos Wizard: Downloaded CSV file contains only default data (rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/41bdc34d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41bdc34d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41bdc34d Branch: refs/heads/trunk Commit: 41bdc34d56da18a921116bbd22207220cd74ca05 Parents: 6016fc6 Author: Robert Levas <rle...@hortonworks.com> Authored: Fri May 8 15:26:26 2015 -0400 Committer: Robert Levas <rle...@hortonworks.com> Committed: Fri May 8 15:26:39 2015 -0400 ---------------------------------------------------------------------- .../main/admin/kerberos/step5_controller.js | 57 ++++++++++++++++++++ .../main/admin/kerberos/step7_controller.js | 51 ------------------ ambari-web/app/routes/add_kerberos_routes.js | 21 ++++---- 3 files changed, 68 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/41bdc34d/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js index 5268c2d..7cad80f 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step5_controller.js @@ -80,6 +80,63 @@ App.KerberosWizardStep5Controller = App.KerberosProgressPageController.extend({ newWindow.focus(); }, + /** + * Send request to post kerberos descriptor + * @param kerberosDescriptor + * @returns {$.ajax|*} + */ + postKerberosDescriptor: function (kerberosDescriptor) { + return App.ajax.send({ + name: 'admin.kerberos.cluster.artifact.create', + sender: this, + data: { + artifactName: 'kerberos_descriptor', + data: { + artifact_data: kerberosDescriptor + } + } + }); + }, + + /** + * Send request to update kerberos descriptor + * @param kerberosDescriptor + * @returns {$.ajax|*} + */ + putKerberosDescriptor: function (kerberosDescriptor) { + return App.ajax.send({ + name: 'admin.kerberos.cluster.artifact.update', + sender: this, + data: { + artifactName: 'kerberos_descriptor', + data: { + artifact_data: kerberosDescriptor + } + }, + success: 'unkerberizeCluster', + error: 'unkerberizeCluster' + }); + }, + + /** + * Send request to unkerberisze cluster + * @returns {$.ajax} + */ + unkerberizeCluster: function () { + return App.ajax.send({ + name: 'admin.unkerberize.cluster', + sender: this, + success: 'goToNextStep', + error: 'goToNextStep' + }); + }, + + + goToNextStep: function() { + this.clearStage(); + App.router.transitionTo('step5'); + }, + isSubmitDisabled: function () { return !["COMPLETED", "FAILED"].contains(this.get('status')); }.property('status') http://git-wip-us.apache.org/repos/asf/ambari/blob/41bdc34d/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js index ece50d7..077f75c 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js @@ -60,57 +60,6 @@ App.KerberosWizardStep7Controller = App.KerberosProgressPageController.extend({ } }, - /** - * Send request to unkerberisze cluster - * @returns {$.ajax} - */ - unkerberizeCluster: function () { - return App.ajax.send({ - name: 'admin.unkerberize.cluster', - sender: this, - success: 'goToNextStep', - error: 'goToNextStep' - }); - }, - - goToNextStep: function() { - this.clearStage(); - App.router.transitionTo('step7'); - }, - - postKerberosDescriptor: function (kerberosDescriptor) { - return App.ajax.send({ - name: 'admin.kerberos.cluster.artifact.create', - sender: this, - data: { - artifactName: 'kerberos_descriptor', - data: { - artifact_data: kerberosDescriptor - } - } - }); - }, - - /** - * Send request to update kerberos descriptor - * @param kerberosDescriptor - * @returns {$.ajax|*} - */ - putKerberosDescriptor: function (kerberosDescriptor) { - return App.ajax.send({ - name: 'admin.kerberos.cluster.artifact.update', - sender: this, - data: { - artifactName: 'kerberos_descriptor', - data: { - artifact_data: kerberosDescriptor - } - }, - success: 'unkerberizeCluster', - error: 'unkerberizeCluster' - }); - }, - retry: function () { this.set('showRetry', false); this.get('tasks').setEach('status', 'PENDING'); http://git-wip-us.apache.org/repos/asf/ambari/blob/41bdc34d/ambari-web/app/routes/add_kerberos_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/add_kerberos_routes.js b/ambari-web/app/routes/add_kerberos_routes.js index b0db95a..0f9f3e3 100644 --- a/ambari-web/app/routes/add_kerberos_routes.js +++ b/ambari-web/app/routes/add_kerberos_routes.js @@ -240,7 +240,16 @@ module.exports = App.WizardRoute.extend({ } }, next: function (router) { - router.transitionTo('step5'); + var kerberosWizardController = router.get('kerberosWizardController'); + var step5Controller = router.get('kerberosWizardStep5Controller'); + var kerberosDescriptor = kerberosWizardController.get('kerberosDescriptorConfigs'); + step5Controller.postKerberosDescriptor(kerberosDescriptor).always(function (data, result, request) { + if (result === 'error' && data.status === 409) { + step5Controller.putKerberosDescriptor(kerberosDescriptor); + } else { + step5Controller.unkerberizeCluster(); + } + }); } }), @@ -305,15 +314,7 @@ module.exports = App.WizardRoute.extend({ var kerberosWizardController = router.get('kerberosWizardController'); kerberosWizardController.setDBProperty('tasksStatuses', null); kerberosWizardController.setDBProperty('tasksRequestIds', null); - var step7Controller = router.get('kerberosWizardStep7Controller'); - var kerberosDescriptor = kerberosWizardController.get('kerberosDescriptorConfigs'); - step7Controller.postKerberosDescriptor(kerberosDescriptor).always(function (data, result, request) { - if (result === 'error' && data.status === 409) { - step7Controller.putKerberosDescriptor(kerberosDescriptor); - } else { - step7Controller.unkerberizeCluster(); - } - }); + router.transitionTo('step7'); } }),