diff --git a/backup/backupManager.py b/backup/backupManager.py index eb9f4fe73..e75e275e5 100755 --- a/backup/backupManager.py +++ b/backup/backupManager.py @@ -48,6 +48,18 @@ class BackupManager: except BaseException as msg: return HttpResponse(str(msg)) + def gDrive(self, request = None, userID = None, data = None): + try: + currentACL = ACLManager.loadedACL(userID) + + if ACLManager.currentContextPermission(currentACL, 'addDeleteDestinations') == 0: + return ACLManager.loadError() + + websitesName = ACLManager.findAllSites(currentACL, userID) + return render(request, 'backup/googleDrive.html', {'websiteList': websitesName}) + except BaseException as msg: + return HttpResponse(str(msg)) + def restoreSite(self, request = None, userID = None, data = None): try: currentACL = ACLManager.loadedACL(userID) diff --git a/backup/templates/backup/googleDrive.html b/backup/templates/backup/googleDrive.html new file mode 100755 index 000000000..5ab7e5ad9 --- /dev/null +++ b/backup/templates/backup/googleDrive.html @@ -0,0 +1,136 @@ +{% extends "baseTemplate/index.html" %} +{% load i18n %} +{% block title %}{% trans "Set up Back up Destinations" %}{% endblock %} +{% block content %} + +{% load static %} + + +{% get_current_language as LANGUAGE_CODE %} + + +
+
+

{% trans "Set up Back up Destinations" %} - {% trans "Remote Backups" %}

+

{% trans "On this page you can set up your Back up destinations. (SFTP)" %}

+
+ +
+
+

+ {% trans "Set up Back up Destinations (SSH port should be 22 on backup server)" %} +

+
+ + +
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ + +
+
+ + + + + +
+ +
+
+

{% trans "Connection to" %} {$ IPAddress $} {% trans "failed. Please delete and re-add. " %} {$ errorMessage $}

+
+ +
+

{% trans "Connection to" %} {$ IPAddress $} {% trans "successful." %}

+
+ +
+

{% trans "Cannot add destination. Error message:" %} {$ errorMessage $}

+
+ +
+

{% trans "Destination Added." %}

+
+ +
+

{% trans "Could not connect to server. Please refresh this page." %}

+
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + +
{% trans "ID" %}{% trans "IP" %}{% trans "Check Connection" %}{% trans "Delete" %}
+
+
+ + + + +
+ + + +
+
+
+ + +
+ + +{% endblock %} \ No newline at end of file diff --git a/backup/urls.py b/backup/urls.py index 9d09770a5..07711116e 100755 --- a/backup/urls.py +++ b/backup/urls.py @@ -6,6 +6,7 @@ urlpatterns = [ url(r'^getCurrentBackups', views.getCurrentBackups, name='getCurrentBackups'), url(r'^backupSite', views.backupSite, name='backupSite'), url(r'^restoreSite', views.restoreSite, name='restoreSite'), + url(r'^gDrive', views.gDrive, name='gDrive'), url(r'^submitBackupCreation', views.submitBackupCreation, name='submitBackupCreation'), diff --git a/backup/views.py b/backup/views.py index bf6512c25..0d6d8ca25 100755 --- a/backup/views.py +++ b/backup/views.py @@ -30,6 +30,13 @@ def backupSite(request): except KeyError: return redirect(loadLoginPage) +def gDrive(request): + try: + userID = request.session['userID'] + bm = BackupManager() + return bm.gDrive(request, userID) + except KeyError: + return redirect(loadLoginPage) def restoreSite(request): try: diff --git a/baseTemplate/templates/baseTemplate/index.html b/baseTemplate/templates/baseTemplate/index.html index 0b3236ded..c445e2f65 100755 --- a/baseTemplate/templates/baseTemplate/index.html +++ b/baseTemplate/templates/baseTemplate/index.html @@ -580,6 +580,9 @@
  • {% trans "Add/Delete Destination" %}
    • +
  • {% trans "Add/Delete Destination" %} +
  • {% trans "Schedule Back up" %}
    • diff --git a/loginSystem/models.py b/loginSystem/models.py index b502acdd3..459b9367b 100755 --- a/loginSystem/models.py +++ b/loginSystem/models.py @@ -87,7 +87,7 @@ class Administrator(models.Model): api = models.IntegerField(default=0) securityLevel = models.IntegerField(default=0) state = models.CharField(max_length=10, default='ACTIVE') - gDrive = models.TextField(max_length=65532, default='Inactive') + #gDrive = models.TextField(max_length=65532, default='Inactive') initWebsitesLimit = models.IntegerField(default=0)