fixconfiguregdrive

IncBackups/urls.py

@@ -23,10 +23,9 @@ urlpatterns = [
     url(r'^removeSite$', views.remove_site, name='removeSite'),
     url(r'^addWebsite$', views.add_website, name='addWebsite'),
     ### V2 Backups URls
-
     url(r'^CreateV2Backup$', views.CreateV2Backup, name='CreateV2Backup'),
     url(r'^ConfigureV2Backup$', views.ConfigureV2Backup, name='ConfigureV2Backup'),
-    url(r'^ConfigureV2BackupSetup$', views.createV2BackupSetup, name='ConfigureV2BackupSetup'),
+    url(r'^ConfigureV2BackupSetup$', views.ConfigureV2BackupSetup, name='ConfigureV2BackupSetup'),
     url(r'^RestoreV2backupSite$', views.RestoreV2backupSite, name='RestoreV2backupSite'),
     url(r'^selectwebsiteRetorev2$', views.selectwebsiteRetorev2, name='selectwebsiteRetorev2'),
     url(r'^selectreporestorev2$', views.selectreporestorev2, name='selectreporestorev2'),

IncBackups/views.py

@@ -731,15 +731,7 @@ def ConfigureV2Backup(request):
         logging.writeToFile(str(msg))
         return redirect(loadLoginPage)
 
-def CreateV2Backup(request):
-    try:
-        userID = request.session['userID']
-        bm = BackupManager()
-        return bm.CreateV2backupSite(request, userID)
-    except KeyError:
-        return redirect(loadLoginPage)
-
-def createV2BackupSetup(request):
+def ConfigureV2BackupSetup(request):
     try:
         userID = request.session['userID']
 
@@ -771,6 +763,15 @@ def createV2BackupSetup(request):
 
         return ConfigureV2Backup(request)
 
+    except BaseException as msg:
+        logging.writeToFile("Error configure"+str(msg))
+        return redirect(loadLoginPage)
+
+def CreateV2Backup(request):
+    try:
+        userID = request.session['userID']
+        bm = BackupManager()
+        return bm.CreateV2backupSite(request, userID)
     except KeyError:
         return redirect(loadLoginPage)
 
@@ -801,7 +802,6 @@ def CreateV2BackupButton(request):
         extra_args['BackupEmails'] = data['websiteEmails'] if 'websiteEmails' in data else False
         extra_args['BackupDatabase'] = data['websiteDatabases'] if 'websiteDatabases' in data else False
 
-
         background = CPBackupsV2(extra_args)
         background.start()
         # background = CPBackupsV2({'domain': Selectedwebsite, 'BasePath': '/home/backup', 'BackupDatabase': 1, 'BackupData': 1,