From 4dae5b08b8a7a938811300b89b8fcbefb30d584d Mon Sep 17 00:00:00 2001
From: Gabriel Copat <copatg@cardiff.ac.uk>
Date: Thu, 14 Dec 2023 07:40:42 +0000
Subject: [PATCH] Fixed merge bbugs

---
 .../java/Team5/SmartTowns/landmarks/LandmarksController.java    | 2 +-
 src/main/resources/templates/fragments/trailsPageFrags.html     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java b/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
index b611410b..f7005bed 100644
--- a/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
+++ b/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
@@ -42,7 +42,7 @@ public class LandmarksController {
 
         } else {
             // converts valid response using Location constructor into a submittable format to the sql table
-            Location loc = new Location(landmarks.getLandmarkName(), landmarks.getLandmarkEmail(), landmarks.getLandmarkDescription(), landmarks.getLandmarkLocation(), landmarks.getTrailID(), false);
+            Location loc = new Location(landmarks.getLandmarkID(), landmarks.getLandmarkName(), landmarks.getLandmarkEmail(), landmarks.getLandmarkDescription(), landmarks.getLandmarkLocation(), landmarks.getTrailID(), false);
             locationRepository.addLocation(loc); // adds valid landmark to locations table
             ModelAndView modelAndView = new ModelAndView("redirect:/home");
             return modelAndView;
diff --git a/src/main/resources/templates/fragments/trailsPageFrags.html b/src/main/resources/templates/fragments/trailsPageFrags.html
index ba6b1e8d..9a62be17 100644
--- a/src/main/resources/templates/fragments/trailsPageFrags.html
+++ b/src/main/resources/templates/fragments/trailsPageFrags.html
@@ -113,7 +113,7 @@
         </div>
         <hr style="height:15px; visibility:hidden;" />
         <H2 id="return">
-            <a href="/home">Home</a></H2>
+            <a href="/mobile-home">Home</a></H2>
         <hr style="height:5px; visibility:hidden;" />
     </article>
     <hr style="height:40px; visibility:hidden;" />
-- 
GitLab