From 9e9130a0de3b1558c9318d062b1cf0dc4d8ba14b Mon Sep 17 00:00:00 2001 From: Usman Nasir Date: Thu, 27 Feb 2020 16:48:45 +0500 Subject: [PATCH] cf --- dns/dnsManager.py | 4 +- dns/static/dns/dns.js | 90 ++++++++++++++++++- .../dns/addDeleteDNSRecordsCloudFlare.html | 10 ++- 3 files changed, 99 insertions(+), 5 deletions(-) diff --git a/dns/dnsManager.py b/dns/dnsManager.py index 8529322b4..fb0eb3b49 100755 --- a/dns/dnsManager.py +++ b/dns/dnsManager.py @@ -727,7 +727,9 @@ class DNSManager: 'name': dns_record['name'], 'content': dns_record['content'], 'priority': '1400', - 'ttl': ttl + 'ttl': ttl, + 'proxy': dns_record['proxied'], + 'proxiable': dns_record['proxiable'] } if checker == 0: diff --git a/dns/static/dns/dns.js b/dns/static/dns/dns.js index 06540e5d1..01ff5299c 100755 --- a/dns/static/dns/dns.js +++ b/dns/static/dns/dns.js @@ -756,7 +756,6 @@ app.controller('addModifyDNSRecordsCloudFlare', function ($scope, $http, $window populateCurrentRecords(); }; - $scope.addDNSRecord = function (type) { $scope.recordsLoading = false; @@ -893,7 +892,6 @@ app.controller('addModifyDNSRecordsCloudFlare', function ($scope, $http, $window }; - function populateCurrentRecords() { var selectedZone = $scope.selectedZone; @@ -1133,6 +1131,94 @@ app.controller('addModifyDNSRecordsCloudFlare', function ($scope, $http, $window }; + $scope.enableProxy = function (id, value) { + + alert(value); + return 0; + + + var selectedZone = $scope.selectedZone; + + url = "/dns/deleteDNSRecordCloudFlare"; + + var data = { + selectedZone: selectedZone, + id: id + }; + + var config = { + headers: { + 'X-CSRFToken': getCookie('csrftoken') + } + }; + + + $http.post(url, data, config).then(ListInitialDatas, cantLoadInitialDatas); + + + function ListInitialDatas(response) { + + + if (response.data.delete_status == 1) { + + + $scope.addRecordsBox = false; + $scope.currentRecords = false; + $scope.canNotFetchRecords = true; + $scope.recordsFetched = true; + $scope.recordDeleted = false; + $scope.recordAdded = true; + $scope.couldNotConnect = true; + $scope.recordsLoading = true; + $scope.recordDeleted = true; + $scope.couldNotDeleteRecords = true; + $scope.couldNotAddRecord = true; + + populateCurrentRecords(); + + + } else { + + $scope.addRecordsBox = true; + $scope.currentRecords = true; + $scope.canNotFetchRecords = true; + $scope.recordsFetched = false; + $scope.recordDeleted = true; + $scope.recordAdded = true; + $scope.couldNotConnect = true; + $scope.recordsLoading = true; + $scope.recordDeleted = true; + $scope.couldNotDeleteRecords = false; + $scope.couldNotAddRecord = true; + + + $scope.errorMessage = response.data.error_message; + + + } + + } + + function cantLoadInitialDatas(response) { + + $scope.addRecordsBox = false; + $scope.currentRecords = false; + $scope.canNotFetchRecords = true; + $scope.recordsFetched = true; + $scope.recordDeleted = true; + $scope.recordAdded = true; + $scope.couldNotConnect = false; + $scope.recordsLoading = true; + $scope.recordDeleted = true; + $scope.couldNotDeleteRecords = true; + $scope.couldNotAddRecord = true; + + + } + + + }; + }); diff --git a/dns/templates/dns/addDeleteDNSRecordsCloudFlare.html b/dns/templates/dns/addDeleteDNSRecordsCloudFlare.html index f68f84063..eb3769004 100755 --- a/dns/templates/dns/addDeleteDNSRecordsCloudFlare.html +++ b/dns/templates/dns/addDeleteDNSRecordsCloudFlare.html @@ -496,6 +496,7 @@ {% trans "TTL" %} {% trans "Value" %} {% trans "Priority" %} + {% trans "Proxy" %} {% trans "Delete" %} @@ -506,6 +507,9 @@ + + + @@ -576,7 +580,8 @@
-
@@ -585,7 +590,8 @@
-