working on #157

phasenraum2010 · phasenraum2010 · commit e5ab432a02f6 · 2017-07-29T23:31:36.000+02:00
diff --git a/src/main/java/org/woehlke/twitterwall/frontend/controller/TweetController.java b/src/main/java/org/woehlke/twitterwall/frontend/controller/TweetController.java
@@ -51,7 +51,7 @@ public String getLatestTweets(
         return "tweet/all";
     }
 
-    @RequestMapping("/id/{id}")
+    @RequestMapping("/{id}")
     public String getLatestTweets(
         @PathVariable("id") Tweet tweet, Model model
     ) {
diff --git a/src/main/resources/templates/hashtag/id.html b/src/main/resources/templates/hashtag/id.html
@@ -16,7 +16,7 @@ <h3>Tweets with the Hashtag #<span th:text="${hashTag.text}">Hashtag</span></h3>
         <div class="row">
             <div class="col-md-12">
                 <span  class="tw-pager-arrow tw-pager-up"  th:if="${latestTweets.hasPrevious()}">
-                    <a href="" th:href="@{|/hashtag/${hashTag.text}?pageTweet=${latestTweets.previousPageable().pageNumber}&amp;pageUser=${users.number}|}">
+                    <a href="" th:href="@{|/hashtag/${hashTag.id}?pageTweet=${latestTweets.previousPageable().pageNumber}&amp;pageUser=${users.number}|}">
                         <span>
                         <i class="fa fa-chevron-circle-up" aria-hidden="true"></i>
                         </span>
@@ -28,7 +28,7 @@ <h3>Tweets with the Hashtag #<span th:text="${hashTag.text}">Hashtag</span></h3>
         <div class="row">
             <div class="col-md-12">
                 <span class="tw-pager-arrow tw-pager-down" th:if="${latestTweets.hasNext()}">
-                    <a href="" th:href="@{|/hashtag/${hashTag.text}?pageTweet=${latestTweets.nextPageable().pageNumber}&amp;pageUser=${users.number}|}" >
+                    <a href="" th:href="@{|/hashtag/${hashTag.id}?pageTweet=${latestTweets.nextPageable().pageNumber}&amp;pageUser=${users.number}|}" >
                         <span>
                         <i class="fa fa-chevron-circle-down" aria-hidden="true"></i>
                         </span>
@@ -45,7 +45,7 @@ <h3>Users with the Hashtag #<span th:text="${hashTag.text}">Hashtag</span></h3>
         <div class="row">
             <div class="col-md-12">
                 <span  class="tw-pager-arrow tw-pager-up" th:if="${users.hasPrevious()}">
-                    <a href="" th:href="@{|/hashtag/${hashTag.text}?pageUser=${users.previousPageable().pageNumber}&amp;pageTweet=${latestTweets.number}|}">
+                    <a href="" th:href="@{|/hashtag/${hashTag.id}?pageUser=${users.previousPageable().pageNumber}&amp;pageTweet=${latestTweets.number}|}">
                         <span>
                         <i class="fa fa-chevron-circle-up" aria-hidden="true"></i>
                         </span>
@@ -58,7 +58,7 @@ <h3>Users with the Hashtag #<span th:text="${hashTag.text}">Hashtag</span></h3>
         <div class="row">
             <div class="col-md-12">
                 <span class="tw-pager-arrow tw-pager-down" th:if="${users.hasNext()}">
-                    <a href="" th:href="@{|/hashtag/${hashTag.text}?pageUser=${users.nextPageable().pageNumber}&amp;pageTweet=${latestTweets.number}|}" >
+                    <a href="" th:href="@{|/hashtag/${hashTag.id}?pageUser=${users.nextPageable().pageNumber}&amp;pageTweet=${latestTweets.number}|}" >
                         <span>
                         <i class="fa fa-chevron-circle-down" aria-hidden="true"></i>
                         </span>
diff --git a/src/main/resources/templates/taskhistory/all.html b/src/main/resources/templates/taskhistory/all.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org">
-<head  th:include="layout :: tw-head">
+<head  th:include="layoutMain :: tw-head">
 </head>
 <body id="page-top" class="page-2" style="padding-top:50px; padding-bottom:200px;">
-<header th:include="layout :: tw-header" >
+<header th:include="layoutMain :: tw-header" >
 </header>
 <main class="page-content">
     <div class="container">
@@ -74,7 +74,7 @@
 <section th:include="layoutMain :: tw-history-back-section" >
 </section>
 
-<footer th:include="layout :: footer" >
+<footer th:include="layoutMain :: footer" >
 
 </footer>
 </body>

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public String getLatestTweets(`
`51`	`51`	`return "tweet/all";`
`52`	`52`	`}`
`53`	`53`
`54`		`- @RequestMapping("/id/{id}")`
	`54`	`+ @RequestMapping("/{id}")`
`55`	`55`	`public String getLatestTweets(`
`56`	`56`	`@PathVariable("id") Tweet tweet, Model model`
`57`	`57`	`) {`