From 9b696a42a4fab7300281cd20810612a55692930c Mon Sep 17 00:00:00 2001
From: Tyler Todd <ttodd@ttodd.com>
Date: Fri, 17 Feb 2023 22:53:08 +0000
Subject: [PATCH] PR Conflict resolution

---
 .../templates/admin_edit_account.html         | 92 ++++++++++++-------
 1 file changed, 59 insertions(+), 33 deletions(-)

diff --git a/powerdnsadmin/templates/admin_edit_account.html b/powerdnsadmin/templates/admin_edit_account.html
index 10ff01f..8080733 100644
--- a/powerdnsadmin/templates/admin_edit_account.html
+++ b/powerdnsadmin/templates/admin_edit_account.html
@@ -103,6 +103,28 @@
                 </select>
               </div>
             </div>
+            <div class="card-body">
+              <p>Domains on the right are associated with the account. Red marked domain names are already associated with other accounts.
+                  Moving already associated domains to this account will overwrite the previous associated account.
+              </p>
+              <p>Hover over the red domain names to show the associated account. Click on domains to move between columns.</p>
+              <div class="form-group col-2">
+                  <select multiple="multiple" class="form-control" id="account_domains"
+                      name="account_domains">
+                      {% for domain in domains %}
+                          {% if account != None and domain.account_id != None and account.id != domain.account_id %}
+                              {% with account_id=domain.account_id %}
+                                  <option style="color: red" data-toggle="tooltip" title="Associated with: {{ accounts[account_id].name }}"
+                                      value="{{ domain.name }}">{{ domain.name }}</option>
+                              {% endwith %}
+                          {% else %}
+                              <option {% if account.id == domain.account_id %}selected{% endif %}
+                                  value="{{ domain.name }}">{{ domain.name }}</option>
+                          {% endif %}
+                      {% endfor %}
+                  </select>
+              </div>
+          </div>
             <div class="card-footer">
               <button type="button" class="btn btn-secondary float-left" onclick="window.location.href='{{ url_for('admin.manage_account') }}'">
                 Cancel
@@ -145,40 +167,44 @@
 {% endblock %}
 {% block extrascripts %}
 <script>
-    $("#account_multi_user").multiSelect({
-        selectableHeader: "<input type='text' class='search-input' autocomplete='off' placeholder='Username'>",
-        selectionHeader: "<input type='text' class='search-input' autocomplete='off' placeholder='Username'>",
-        afterInit: function (ms) {
-            var that = this,
-                $selectableSearch = that.$selectableUl.prev(),
-                $selectionSearch = that.$selectionUl.prev(),
-                selectableSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selectable:not(.ms-selected)',
-                selectionSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selection.ms-selected';
+    function addMultiSelect(id, placeholder) {
+        $(id).multiSelect({
+            selectableHeader: `<input type='text' class='search-input' autocomplete='off' placeholder='${placeholder}'>`,
+            selectionHeader: `<input type='text' class='search-input' autocomplete='off' placeholder='${placeholder}'>`,
+            afterInit: function (ms) {
+                var that = this,
+                    $selectableSearch = that.$selectableUl.prev(),
+                    $selectionSearch = that.$selectionUl.prev(),
+                    selectableSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selectable:not(.ms-selected)',
+                    selectionSearchString = '#' + that.$container.attr('id') + ' .ms-elem-selection.ms-selected';
 
-            that.qs1 = $selectableSearch.quicksearch(selectableSearchString)
-                .on('keydown', function (e) {
-                    if (e.which === 40) {
-                        that.$selectableUl.focus();
-                        return false;
-                    }
-                });
+                that.qs1 = $selectableSearch.quicksearch(selectableSearchString)
+                    .on('keydown', function (e) {
+                        if (e.which === 40) {
+                            that.$selectableUl.focus();
+                            return false;
+                        }
+                    });
 
-            that.qs2 = $selectionSearch.quicksearch(selectionSearchString)
-                .on('keydown', function (e) {
-                    if (e.which == 40) {
-                        that.$selectionUl.focus();
-                        return false;
-                    }
-                });
-        },
-        afterSelect: function () {
-            this.qs1.cache();
-            this.qs2.cache();
-        },
-        afterDeselect: function () {
-            this.qs1.cache();
-            this.qs2.cache();
-        }
-    });
+                that.qs2 = $selectionSearch.quicksearch(selectionSearchString)
+                    .on('keydown', function (e) {
+                        if (e.which == 40) {
+                            that.$selectionUl.focus();
+                            return false;
+                        }
+                    });
+            },
+            afterSelect: function () {
+                this.qs1.cache();
+                this.qs2.cache();
+            },
+            afterDeselect: function () {
+                this.qs1.cache();
+                this.qs2.cache();
+            }
+        });
+    }
+    addMultiSelect("#account_multi_user", "Username")
+    addMultiSelect("#account_domains", "Domain")
 </script>
 {% endblock %}