From f81bcb161a0dc65f6b3d585de2a1a53fc1bac683 Mon Sep 17 00:00:00 2001
From: andryyy <andre.peters@debinux.de>
Date: Mon, 24 Apr 2017 13:13:23 +0200
Subject: [PATCH] Fix editing catch-all addresses, show primary domain of alias
 in alias domain

---
 data/web/js/mailbox.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/web/js/mailbox.js b/data/web/js/mailbox.js
index 4e6b303d..118cd1d0 100644
--- a/data/web/js/mailbox.js
+++ b/data/web/js/mailbox.js
@@ -219,13 +219,16 @@ $(document).ready(function() {
     },
     success: function (data) {
       $.each(data, function (i, item) {
-        if (item.is_catch_all == 1) {
-          item.address = '<div class="label label-default">Catch-All</div> ' + item.address;
-        }
         item.action = '<div class="btn-group">' +
           '<a href="/edit.php?alias=' + encodeURI(item.address) + '" class="btn btn-xs btn-default"><span class="glyphicon glyphicon-pencil"></span> ' + lang.edit + '</a>' +
           '<a href="/delete.php?alias=' + encodeURI(item.address) + '" class="btn btn-xs btn-danger"><span class="glyphicon glyphicon-trash"></span> ' + lang.remove + '</a>' +
 					'</div>';
+        if (item.is_catch_all == 1) {
+          item.address = '<div class="label label-default">Catch-All</div> ' + item.address;
+        }
+        if (item.in_primary_domain !== "") {
+          item.domain = "↳ " + item.domain + " (" + item.in_primary_domain + ")";
+        }
       });
       $('#alias_table').footable({
         "columns": [