move domain mailboxes to domain detail page and only enable it if catch-all is on

app/dashboard/templates/dashboard/custom_domain.html

@@ -62,37 +62,7 @@
                 <h6 class="card-subtitle mb-4 text-muted">
                   Created {{ custom_domain.created_at | dt }} <br>
                   <span class="font-weight-bold">{{ custom_domain.nb_alias() }}</span> aliases.
-                  <br><br>
-
-                  <b>Mailboxes:</b>
-                  <i class="fe fe-info" data-toggle="tooltip"
-                     title="Aliases created with this domain are automatically owned by these mailboxes">
-                  </i>
                   <br>
-
-                  {% set domain_mailboxes=custom_domain.mailboxes %}
-                  <form method="post" class="mt-2">
-                    <input type="hidden" name="form-name" value="update">
-                    <input type="hidden" name="domain-id" value="{{ custom_domain.id }}">
-
-                    <div class="d-flex">
-                      <div class="flex-grow-1 mr-2">
-                        <select data-width="100%" required
-                                class="mailbox-select" multiple name="mailbox_ids">
-                          {% for mailbox in mailboxes %}
-                            <option value="{{ mailbox.id }}" {% if mailbox in domain_mailboxes %}
-                                    selected {% endif %}>
-                              {{ mailbox.email }}
-                            </option>
-                          {% endfor %}
-                        </select>
-                      </div>
-                      <div>
-                        <button class="btn btn-outline-primary btn-sm">Update</button>
-                      </div>
-                    </div>
-                  </form>
-
                 </h6>
 
                 <a href="{{ url_for('dashboard.domain_detail', custom_domain_id=custom_domain.id) }}" class="mt-3">
@@ -118,25 +88,10 @@
                 {{ new_custom_domain_form.domain(class="form-control", placeholder="my-domain.com", maxlength=128) }}
                 {{ render_field_errors(new_custom_domain_form.domain) }}
                 <div class="small-text">
-                  Please use full path domain, for ex <em>my-subdomain.my-domain.com</em>
+                  Please use full path domain, for example <b>my-domain.com</b>
+                  or <b>my-subdomain.my-domain.com</b> if you are using a subdomain.
                 </div>
 
-                <div class="mt-3 small-text alert alert-info">
-                  By default, aliases created with your domain are "owned" by your default
-                  mailbox <b>{{ current_user.default_mailbox.email }}</b>. <br>
-                  This below option allow you to choose the mailbox(es) that a new alias automatically belongs to.
-                </div>
-
-                <select data-width="100%"
-                        class="mailbox-select" multiple name="mailbox_ids">
-                  {% for mailbox in mailboxes %}
-                    <option value="{{ mailbox.id }}" {% if mailbox.id == current_user.default_mailbox_id %}
-                            selected {% endif %}>
-                      {{ mailbox.email }}
-                    </option>
-                  {% endfor %}
-                </select>
-
                 <button class="btn btn-primary mt-2">Create</button>
               </form>
             </div>

app/dashboard/templates/dashboard/domain_detail/info.html

@@ -45,11 +45,38 @@
     </form>
   </div>
 
+  <div class="{% if not custom_domain.catch_all %} disabled-content {% endif %}">
+    <div>Auto-created aliases are automatically owned by these mailboxes</div>
+    {% set domain_mailboxes=custom_domain.mailboxes %}
+    <form method="post" class="mt-2">
+      <input type="hidden" name="form-name" value="update">
+      <input type="hidden" name="domain-id" value="{{ custom_domain.id }}">
+
+      <div class="d-flex">
+        <div class="flex-grow-1 mr-2">
+          <select data-width="100%" required
+                  class="mailbox-select" multiple name="mailbox_ids">
+            {% for mailbox in mailboxes %}
+              <option value="{{ mailbox.id }}" {% if mailbox in domain_mailboxes %}
+                      selected {% endif %}>
+                {{ mailbox.email }}
+              </option>
+            {% endfor %}
+          </select>
+        </div>
+        <div>
+          <button class="btn btn-outline-primary btn-sm">Update</button>
+        </div>
+      </div>
+    </form>
+  </div>
+
+
   <hr>
   <h3 class="mb-1">Default Display Name</h3>
   <div class="">
     Default display name for aliases created with <b>{{ custom_domain.domain }}</b>
-     unless overwritten by the alias display name.
+    unless overwritten by the alias display name.
   </div>
 
   <div>
@@ -108,6 +135,8 @@
 
 {% block script %}
   <script>
+    $('.mailbox-select').multipleSelect();
+
     $(".custom-switch-input").change(function (e) {
       $(this).closest("form").submit();
     });
@@ -137,3 +166,4 @@
     });
   </script>
 {% endblock %}
+

app/dashboard/views/custom_domain.py

@@ -88,43 +88,6 @@ def custom_domain():
                             custom_domain_id=new_custom_domain.id,
                         )
                     )
-        elif request.form.get("form-name") == "update":
-            domain_id = request.form.get("domain-id")
-            domain = CustomDomain.get(domain_id)
-
-            if not domain or domain.user_id != current_user.id:
-                flash("Unknown error. Refresh the page", "warning")
-                return redirect(url_for("dashboard.custom_domain"))
-
-            mailbox_ids = request.form.getlist("mailbox_ids")
-            # check if mailbox is not tempered with
-            mailboxes = []
-            for mailbox_id in mailbox_ids:
-                mailbox = Mailbox.get(mailbox_id)
-                if (
-                    not mailbox
-                    or mailbox.user_id != current_user.id
-                    or not mailbox.verified
-                ):
-                    flash("Something went wrong, please retry", "warning")
-                    return redirect(url_for("dashboard.custom_domain"))
-                mailboxes.append(mailbox)
-
-            if not mailboxes:
-                flash("You must select at least 1 mailbox", "warning")
-                return redirect(url_for("dashboard.custom_domain"))
-
-            # first remove all existing domain-mailboxes links
-            DomainMailbox.query.filter_by(domain_id=domain.id).delete()
-            db.session.flush()
-
-            for mailbox in mailboxes:
-                DomainMailbox.create(domain_id=domain.id, mailbox_id=mailbox.id)
-
-            db.session.commit()
-            flash(f"Domain {domain.domain} has been updated", "success")
-
-            return redirect(url_for("dashboard.custom_domain"))
 
     return render_template(
         "dashboard/custom_domain.html",

app/dashboard/views/domain_detail.py

@@ -14,7 +14,7 @@ from app.dns_utils import (
 from app.email_utils import send_email
 from app.extensions import db
 from app.log import LOG
-from app.models import CustomDomain, Alias, DomainDeletedAlias
+from app.models import CustomDomain, Alias, DomainDeletedAlias, Mailbox, DomainMailbox
 from app.utils import random_string
 
 
@@ -159,6 +159,8 @@ def domain_detail_dns(custom_domain_id):
 @login_required
 def domain_detail(custom_domain_id):
     custom_domain = CustomDomain.get(custom_domain_id)
+    mailboxes = current_user.mailboxes()
+
     if not custom_domain or custom_domain.user_id != current_user.id:
         flash("You cannot see this page", "warning")
         return redirect(url_for("dashboard.index"))
@@ -219,6 +221,46 @@ def domain_detail(custom_domain_id):
             return redirect(
                 url_for("dashboard.domain_detail", custom_domain_id=custom_domain.id)
             )
+        elif request.form.get("form-name") == "update":
+            mailbox_ids = request.form.getlist("mailbox_ids")
+            # check if mailbox is not tempered with
+            mailboxes = []
+            for mailbox_id in mailbox_ids:
+                mailbox = Mailbox.get(mailbox_id)
+                if (
+                    not mailbox
+                    or mailbox.user_id != current_user.id
+                    or not mailbox.verified
+                ):
+                    flash("Something went wrong, please retry", "warning")
+                    return redirect(
+                        url_for(
+                            "dashboard.domain_detail", custom_domain_id=custom_domain.id
+                        )
+                    )
+                mailboxes.append(mailbox)
+
+            if not mailboxes:
+                flash("You must select at least 1 mailbox", "warning")
+                return redirect(
+                    url_for(
+                        "dashboard.domain_detail", custom_domain_id=custom_domain.id
+                    )
+                )
+
+            # first remove all existing domain-mailboxes links
+            DomainMailbox.query.filter_by(domain_id=custom_domain.id).delete()
+            db.session.flush()
+
+            for mailbox in mailboxes:
+                DomainMailbox.create(domain_id=custom_domain.id, mailbox_id=mailbox.id)
+
+            db.session.commit()
+            flash(f"{custom_domain.domain} mailboxes has been updated", "success")
+
+            return redirect(
+                url_for("dashboard.domain_detail", custom_domain_id=custom_domain.id)
+            )
         elif request.form.get("form-name") == "delete":
             name = custom_domain.domain
             LOG.d("Schedule deleting %s", custom_domain)