Move delete domain to domain info page
This commit is contained in:
parent
28a0f9c616
commit
8d85ab35f1
|
@ -21,9 +21,9 @@
|
||||||
<div class="font-weight-bold">1. MX record
|
<div class="font-weight-bold">1. MX record
|
||||||
|
|
||||||
{% if custom_domain.verified %}
|
{% if custom_domain.verified %}
|
||||||
<span class="cursor" data-toggle="tooltip" data-original-title="MX Record Verified">✅</span>
|
<span class="cursor" data-toggle="tooltip" data-original-title="MX Record Verified">✅</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="cursor" data-toggle="tooltip" data-original-title="MX Record Not Verified">🚫 </span>
|
<span class="cursor" data-toggle="tooltip" data-original-title="MX Record Not Verified">🚫 </span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -70,9 +70,9 @@
|
||||||
<div>
|
<div>
|
||||||
<div class="font-weight-bold">2. SPF (Optional)
|
<div class="font-weight-bold">2. SPF (Optional)
|
||||||
{% if custom_domain.spf_verified %}
|
{% if custom_domain.spf_verified %}
|
||||||
<span class="cursor" data-toggle="tooltip" data-original-title="SPF Verified">✅</span>
|
<span class="cursor" data-toggle="tooltip" data-original-title="SPF Verified">✅</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="cursor" data-toggle="tooltip" data-original-title="SPF Not Verified">🚫 </span>
|
<span class="cursor" data-toggle="tooltip" data-original-title="SPF Not Verified">🚫 </span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -126,9 +126,9 @@
|
||||||
<div>
|
<div>
|
||||||
<div class="font-weight-bold">3. DKIM (Optional)
|
<div class="font-weight-bold">3. DKIM (Optional)
|
||||||
{% if custom_domain.dkim_verified %}
|
{% if custom_domain.dkim_verified %}
|
||||||
<span class="cursor" data-toggle="tooltip" data-original-title="SPF Verified">✅</span>
|
<span class="cursor" data-toggle="tooltip" data-original-title="SPF Verified">✅</span>
|
||||||
{% else %}
|
{% else %}
|
||||||
<span class="cursor" data-toggle="tooltip" data-original-title="DKIM Not Verified">🚫 </span>
|
<span class="cursor" data-toggle="tooltip" data-original-title="DKIM Not Verified">🚫 </span>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -184,33 +184,5 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<hr>
|
|
||||||
<h3 class="mb-0">Delete Domain</h3>
|
|
||||||
<div class="small-text mb-3">Please note that this operation is irreversible.
|
|
||||||
All aliases associated with this domain will be also deleted
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<form method="post">
|
|
||||||
<input type="hidden" name="form-name" value="delete">
|
|
||||||
<span class="delete-custom-domain btn btn-outline-danger">Delete domain</span>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block script %}
|
|
||||||
<script>
|
|
||||||
$(".delete-custom-domain").on("click", function (e) {
|
|
||||||
notie.confirm({
|
|
||||||
text: "All aliases associated with <b>{{ custom_domain.domain }}</b> will be also deleted, " +
|
|
||||||
" please confirm.",
|
|
||||||
cancelCallback: () => {
|
|
||||||
// nothing to do
|
|
||||||
},
|
|
||||||
submitCallback: () => {
|
|
||||||
$(this).closest("form").submit();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
{% endblock %}
|
|
|
@ -47,12 +47,36 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<hr>
|
||||||
|
<h3 class="mb-0">Delete Domain</h3>
|
||||||
|
<div class="small-text mb-3">Please note that this operation is irreversible.
|
||||||
|
All aliases associated with this domain will be also deleted
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<form method="post">
|
||||||
|
<input type="hidden" name="form-name" value="delete">
|
||||||
|
<span class="delete-custom-domain btn btn-outline-danger">Delete domain</span>
|
||||||
|
</form>
|
||||||
|
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block script %}
|
{% block script %}
|
||||||
<script>
|
<script>
|
||||||
$(".custom-switch-input").change(function (e) {
|
$(".custom-switch-input").change(function (e) {
|
||||||
$(this).closest("form").submit();
|
$(this).closest("form").submit();
|
||||||
})
|
});
|
||||||
|
|
||||||
|
$(".delete-custom-domain").on("click", function (e) {
|
||||||
|
notie.confirm({
|
||||||
|
text: "All aliases associated with <b>{{ custom_domain.domain }}</b> will be also deleted, " +
|
||||||
|
" please confirm.",
|
||||||
|
cancelCallback: () => {
|
||||||
|
// nothing to do
|
||||||
|
},
|
||||||
|
submitCallback: () => {
|
||||||
|
$(this).closest("form").submit();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
{% endblock %}
|
{% endblock %}
|
|
@ -87,13 +87,7 @@ def domain_detail_dns(custom_domain_id):
|
||||||
dkim_ok = False
|
dkim_ok = False
|
||||||
dkim_errors = get_txt_record(f"dkim._domainkey.{custom_domain.domain}")
|
dkim_errors = get_txt_record(f"dkim._domainkey.{custom_domain.domain}")
|
||||||
|
|
||||||
elif request.form.get("form-name") == "delete":
|
|
||||||
name = custom_domain.domain
|
|
||||||
CustomDomain.delete(custom_domain_id)
|
|
||||||
db.session.commit()
|
|
||||||
flash(f"Domain {name} has been deleted", "success")
|
|
||||||
|
|
||||||
return redirect(url_for("dashboard.custom_domain"))
|
|
||||||
|
|
||||||
spf_include_records = []
|
spf_include_records = []
|
||||||
for priority, email_server in EMAIL_SERVERS_WITH_PRIORITY:
|
for priority, email_server in EMAIL_SERVERS_WITH_PRIORITY:
|
||||||
|
@ -137,6 +131,13 @@ def domain_detail(custom_domain_id):
|
||||||
return redirect(
|
return redirect(
|
||||||
url_for("dashboard.domain_detail", custom_domain_id=custom_domain.id)
|
url_for("dashboard.domain_detail", custom_domain_id=custom_domain.id)
|
||||||
)
|
)
|
||||||
|
elif request.form.get("form-name") == "delete":
|
||||||
|
name = custom_domain.domain
|
||||||
|
CustomDomain.delete(custom_domain_id)
|
||||||
|
db.session.commit()
|
||||||
|
flash(f"Domain {name} has been deleted", "success")
|
||||||
|
|
||||||
|
return redirect(url_for("dashboard.custom_domain"))
|
||||||
|
|
||||||
nb_alias = GenEmail.filter_by(custom_domain_id=custom_domain.id).count()
|
nb_alias = GenEmail.filter_by(custom_domain_id=custom_domain.id).count()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue