From af3adbb2684e0d21cc19b1b729ac376b76820e20 Mon Sep 17 00:00:00 2001
From: Dave Syer <dsyer@vmware.com>
Date: Sat, 21 Oct 2023 08:23:58 +0100
Subject: [PATCH] Use hx-push-url where possible

---
 .../resources/templates/fragments/layout.html |  2 +-
 .../resources/templates/fragments/owners.html | 25 +++++--------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/templates/fragments/layout.html b/src/main/resources/templates/fragments/layout.html
index e10a525..63ae5fd 100755
--- a/src/main/resources/templates/fragments/layout.html
+++ b/src/main/resources/templates/fragments/layout.html
@@ -37,7 +37,7 @@
           <li th:fragment="menuItem (link,active,title,glyph,text,target)" th:class="nav-item"
               _="on htmx:afterOnLoad take .active for event.target">
             <a th:class="${active==menu ? 'nav-link active' : 'nav-link'}" th:href="@{__${link}__}" th:title="${title}"
-               hx:get="@{__${link}__}" hx:target="${target}" hx:push-url="@{__${link}__}">
+               hx:get="@{__${link}__}" hx:target="${target}" hx-push-url="true">
               <span th:class="'fa fa-'+${glyph}" class="fa fa-home"></span>
               <span th:text="${text}">Template</span>
             </a>
diff --git a/src/main/resources/templates/fragments/owners.html b/src/main/resources/templates/fragments/owners.html
index bf6c5eb..4e59731 100644
--- a/src/main/resources/templates/fragments/owners.html
+++ b/src/main/resources/templates/fragments/owners.html
@@ -25,7 +25,7 @@ <h2>Find Owners</h2>
     </div>
 
     <a class="btn btn-primary" hx:get="@{/owners/new}" hx-swap="innerHTML" hx-target="#block-content"
-       hx:push-url="@{/owners/new}" th:href="@{/owners/new}">Add Owner</a>
+       hx-push-url="true" th:href="@{/owners/new}">Add Owner</a>
 
   </form>
 </div>
@@ -47,7 +47,7 @@ <h2>Owners</h2>
     <tr th:each="owner : ${listOwners}">
       <td>
         <a th:href="@{/owners/__${owner.id}__}" th:text="${owner.firstName + ' ' + owner.lastName}"
-        hx:get="@{/owners/__${owner.id}__}" hx:push-url="@{/owners/__${owner.id}__}" hx-target="#block-content"/></a>
+        hx:get="@{/owners/__${owner.id}__}" hx-push-url="true" hx-target="#block-content"/></a>
       </td>
       <td th:text="${owner.address}"/>
       <td th:text="${owner.city}"/>
@@ -83,17 +83,10 @@ <h2>Owner Information</h2>
     </tr>
   </table>
 
-<<<<<<< HEAD
-  <a hx:get="@{__${owner.id}__/edit}" hx-target="#block-content" th:href="@{__${owner.id}__/edit}"
+  <a hx:get="@{__${owner.id}__/edit}" hx-push-url="true" hx-target="#block-content" th:href="@{__${owner.id}__/edit}"
      class="btn btn-primary">Edit
     Owner</a>
-  <a hx:get="@{__${owner.id}__/pets/new}" th:href="@{__${owner.id}__/pets/new}" hx-target="#block-content" class="btn btn-primary">Add
-=======
-  <a hx:get="@{__${owner.id}__/edit}" hx:push-url="@{__${owner.id}__/edit}" hx-target="#block-content" th:href="@{__${owner.id}__/edit}"
-     class="btn btn-primary">Edit
-    Owner</a>
-  <a hx:get="@{__${owner.id}__/pets/new}" hx:push-url="@{__${owner.id}__/pets/new}" th:href="@{__${owner.id}__/pets/new}" hx-target="#block-content" class="btn btn-primary">Add
->>>>>>> 9a4ee11 (Remove unnecessary servlet response manipulations)
+  <a hx:get="@{__${owner.id}__/pets/new}" hx-push-url="true" th:href="@{__${owner.id}__/pets/new}" hx-target="#block-content" class="btn btn-primary">Add
     New Pet</a>
 </div>
 
@@ -129,19 +122,13 @@ <h2>Pets and Visits</h2>
           </tr>
           <tr>
             <td><a th:href="@{__${owner.id}__/pets/__${pet.id}__/edit}"
-<<<<<<< HEAD
-                   hx-get="@{__${owner.id}__/pets/__${pet.id}__/edit}" hx-target="#block-content">Edit Pet</a></td>
-            <td><a th:href="@{__${owner.id}__/pets/__${pet.id}__/visits/new}"
-                   hx:get="@{__${owner.id}__/pets/__${pet.id}__/visits/new}" hx-target="#block-content">Add Visit</a></td>
-=======
                    hx:get="@{__${owner.id}__/pets/__${pet.id}__/edit}"
-                   hx:push-url="@{__${owner.id}__/pets/__${pet.id}__/edit}"
+                   hx-push-url="true"
                    hx-target="#block-content">Edit Pet</a></td>
             <td><a th:href="@{__${owner.id}__/pets/__${pet.id}__/visits/new}"
                    hx:get="@{__${owner.id}__/pets/__${pet.id}__/visits/new}"
-                   hx:push-url="@{__${owner.id}__/pets/__${pet.id}__/visits/new}"
+                   hx-push-url="true"
                    hx-target="#block-content">Add Visit</a></td>
->>>>>>> 9a4ee11 (Remove unnecessary servlet response manipulations)
           </tr>
         </table>
       </td>