From d4be2b9e9477236c9a963f9a94d74e69f5bcd75b Mon Sep 17 00:00:00 2001
From: localhorst <localhorst@mosad.xyz>
Date: Sat, 16 May 2020 22:48:40 +0200
Subject: [PATCH] Revert "Revert "added link from listedArticles page to
 related offered article""

This reverts commit 3c69f38367677bbc197b5b57b74d566226dff41e.
---
 .../controller/intern/suppliers/SupplierOfferController.java    | 2 ++
 .../src/main/resources/templates/intern/listedArticles/id.html  | 2 +-
 .../main/resources/templates/intern/listedArticles/index.html   | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java
index bd27558..501d749 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/SupplierOfferController.java
@@ -6,7 +6,9 @@ import java.util.List;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
 @RequestMapping("/intern/")
diff --git a/prototype/src/main/resources/templates/intern/listedArticles/id.html b/prototype/src/main/resources/templates/intern/listedArticles/id.html
index 3e18cb8..b2e878a 100644
--- a/prototype/src/main/resources/templates/intern/listedArticles/id.html
+++ b/prototype/src/main/resources/templates/intern/listedArticles/id.html
@@ -29,7 +29,7 @@
                <p class="s">
                   <label for="ref-article">Refernzierter Artikel</label>
                   <input class="" type="text" name="ref-article" th:value="${ArticleID.offer_id}" disabled/>
-               <td><a th:href="@{/intern/suppliers/articles/{id}(id = ${ArticleID.offer_id})}">Details</a></td>
+               <td><a th:href="${'/intern/supplierOffers/#q=' + {ArticleID.id}}">Details</a></td>
                </p>
                <div class="spacer"></div>
                <div class="m">
diff --git a/prototype/src/main/resources/templates/intern/listedArticles/index.html b/prototype/src/main/resources/templates/intern/listedArticles/index.html
index ad8a771..2840417 100644
--- a/prototype/src/main/resources/templates/intern/listedArticles/index.html
+++ b/prototype/src/main/resources/templates/intern/listedArticles/index.html
@@ -53,7 +53,7 @@
                      <td><span th:text="${article.price_netto}"></span> €</td>
                      <td><span th:text="${article.categorie}"></span></td>
                      <td><span th:text="${article.stock}"></span></td>
-                     <td><a th:href="@{/intern/supplierOffered/{id}(id = ${article.offer_id})}" th:text="${article.offer_id}"></a></td>
+                     <td><a th:href="${'/intern/supplierOffers/#q=' + {article.id}}" th:text="${article.offer_id}"></a></td>
                      <td><a th:href="@{/intern/articles/{id}(id = ${article.id})}" th:text="${article.id}"></a></td>
                      <td>
                         <form th:action="@{/intern/articles/{id}(id = ${article.id})}"><input type="submit" value="Bearbeiten" /></form>