remove "set-mailbox" form post
This commit is contained in:
parent
1a081f87c4
commit
a2666cc4fe
|
@ -215,33 +215,28 @@
|
||||||
<div class="collapse" id="alias-{{ alias.id }}">
|
<div class="collapse" id="alias-{{ alias.id }}">
|
||||||
|
|
||||||
{% if mailboxes|length > 1 %}
|
{% if mailboxes|length > 1 %}
|
||||||
<form method="post">
|
<div class="small-text mt-2">Current mailbox</div>
|
||||||
<div class="small-text mt-2">Current mailbox</div>
|
<div class="d-flex">
|
||||||
<div class="d-flex">
|
<div class="flex-grow-1 mr-2">
|
||||||
<div class="flex-grow-1 mr-2">
|
<select id="mailbox-{{ alias.id }}"
|
||||||
<select id="mailbox-{{ alias.id }}"
|
class="form-control form-control-sm custom-select" name="mailbox">
|
||||||
class="form-control form-control-sm custom-select" name="mailbox">
|
{% for mailbox in mailboxes %}
|
||||||
{% for mailbox in mailboxes %}
|
<option value="{{ mailbox.id }}" {% if mailbox.id == alias_info.mailbox.id %}
|
||||||
<option value="{{ mailbox.id }}" {% if mailbox.id == alias_info.mailbox.id %}
|
selected {% endif %}>
|
||||||
selected {% endif %}>
|
{{ mailbox.email }}
|
||||||
{{ mailbox.email }}
|
</option>
|
||||||
</option>
|
{% endfor %}
|
||||||
{% endfor %}
|
</select>
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="">
|
|
||||||
<input type="hidden" name="form-name" value="set-mailbox">
|
|
||||||
<input type="hidden" name="alias-id" value="{{ alias.id }}">
|
|
||||||
|
|
||||||
<a data-alias="{{ alias.id }}"
|
|
||||||
class="save-mailbox btn btn-sm btn-outline-info w-100">
|
|
||||||
Update
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
|
||||||
|
<div class="">
|
||||||
|
<a data-alias="{{ alias.id }}"
|
||||||
|
class="save-mailbox btn btn-sm btn-outline-info w-100">
|
||||||
|
Update
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
{% elif alias_info.mailbox != None and alias_info.mailbox.email != current_user.email %}
|
{% elif alias_info.mailbox != None and alias_info.mailbox.email != current_user.email %}
|
||||||
<div class="small-text">
|
<div class="small-text">
|
||||||
Owned by <b>{{ alias_info.mailbox.email }}</b> mailbox
|
Owned by <b>{{ alias_info.mailbox.email }}</b> mailbox
|
||||||
|
|
|
@ -87,30 +87,7 @@ def index():
|
||||||
LOG.error("alias %s has been added before to DeletedAlias", email)
|
LOG.error("alias %s has been added before to DeletedAlias", email)
|
||||||
db.session.rollback()
|
db.session.rollback()
|
||||||
|
|
||||||
|
return redirect(url_for("dashboard.index", query=query, sort=sort))
|
||||||
elif request.form.get("form-name") == "set-mailbox":
|
|
||||||
alias_id = request.form.get("alias-id")
|
|
||||||
alias: Alias = Alias.get(alias_id)
|
|
||||||
mailbox_email = request.form.get("mailbox")
|
|
||||||
|
|
||||||
mailbox = Mailbox.get_by(email=mailbox_email)
|
|
||||||
if not mailbox or mailbox.user_id != current_user.id:
|
|
||||||
flash("Something went wrong, please retry", "warning")
|
|
||||||
else:
|
|
||||||
alias.mailbox_id = mailbox.id
|
|
||||||
db.session.commit()
|
|
||||||
LOG.d("Set alias %s mailbox to %s", alias, mailbox)
|
|
||||||
|
|
||||||
flash(
|
|
||||||
f"Update mailbox for {alias.email} to {mailbox_email}", "success",
|
|
||||||
)
|
|
||||||
return redirect(
|
|
||||||
url_for(
|
|
||||||
"dashboard.index", highlight_alias_id=alias.id, query=query,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
return redirect(url_for("dashboard.index", query=query))
|
|
||||||
|
|
||||||
client_users = (
|
client_users = (
|
||||||
ClientUser.filter_by(user_id=current_user.id)
|
ClientUser.filter_by(user_id=current_user.id)
|
||||||
|
|
Loading…
Reference in a new issue