MAGETWO-44477: Rollback database backup is not functioning

Author: Denys Rul

lib/web/mage/adminhtml/backup.js

@@ -15,12 +15,6 @@ define([
         initialize : function(a, b){
             this.reset();
             this.rollbackUrl = this.backupUrl = '';
-            this.rollbackForm = jQuery('#rollback-form').mage('validation', {
-                submitHandler: jQuery.proxy(this.submitRollback, this)
-            });
-            this.backupForm = jQuery('#backup-form').mage('validation', {
-                submitHandler: jQuery.proxy(this.submitBackup, this)
-            });
         },
 
         reset: function() {
@@ -49,14 +43,17 @@ define([
 
         requestBackupOptions: function() {
             this.hidePopups();
+            
             var action = this.type != 'snapshot' ? 'hide' : 'show';
-            $$('#exclude-media-checkbox-container').invoke(action);
+            
             this.showPopup('backup-options');
+
+            $$('#exclude-media-checkbox-container').invoke(action);
         },
 
         requestPassword: function() {
             this.hidePopups();
-            
+
             this.showPopup('rollback-request-password');
 
             this.type != 'db' ?
@@ -89,12 +86,12 @@ define([
                 method: 'post',
                 parameters: data
             });
+
+            this.modal.modal('closeModal');
         },
 
         submitRollback: function() {
             var data = this.getPostData();
-            
-            this.hidePopups();
 
             new Ajax.Request(this.rollbackUrl, {
                 onSuccess: function(transport) {
@@ -103,6 +100,8 @@ define([
                 method: 'post',
                 parameters: data
             });
+
+            this.modal.modal('closeModal');
         },
 
         processResponse: function(transport, popupId) {
@@ -150,10 +149,6 @@ define([
                         submitHandler: jQuery.proxy(this.submitBackup, this)
                     });
                     this.modal.find('#backup-form').submit();
-                    this.modal.modal('closeModal');
-                },
-                opened: function () {
-                    this.modal.find(':hidden').show();
                 }
             },
             'rollback-warning': {
@@ -176,10 +171,8 @@ define([
                         submitHandler: jQuery.proxy(this.submitRollback, this)
                     });
                     this.modal.find('#rollback-form').submit();
-                    this.modal.modal('closeModal');
                 },
                 opened: function () {
-                    this.modal.find('*:hidden').show();
                     this.toggleFtpCredentialsForm();
                 }
             }