JPA with PostgreSQL

phasenraum2010 · phasenraum2010 · commit 299935572ffe · 2018-05-23T01:38:15.000+02:00
diff --git a/src/main/java/org/woehlke/learn/learnneo4j/components/db/PortinfoController.java b/src/main/java/org/woehlke/learn/learnneo4j/components/db/PortinfoController.java
@@ -6,24 +6,23 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.woehlke.learn.learnneo4j.model.platform.PlatformController;
 
 @Controller
-@RequestMapping("/db/Portinfo")
+@RequestMapping("/db/portinfo")
 public class PortinfoController {
 
-    private static Logger log = LoggerFactory.getLogger(PlatformController.class.getName());
+    private static Logger log = LoggerFactory.getLogger(PortinfoController.class.getName());
 
-    @ModelAttribute("title")
-    public String getTitle(){
-        return "Portinfo";
-    }
+    //@ModelAttribute("title")
+    //public String getTitle(){
+    //    return "Portinfo";
+    //}
 
     @GetMapping("/all")
     public String greeting(Model model) {
         model.addAttribute("all", portinfoService.findAll());
+        model.addAttribute("title","Portinfo");
         log.info("db/portinfo/all");
         return "db/portinfo/all";
     }
diff --git a/src/main/java/org/woehlke/learn/learnneo4j/components/home/HomeController.java b/src/main/java/org/woehlke/learn/learnneo4j/components/home/HomeController.java
@@ -4,7 +4,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @Controller
@@ -29,13 +28,14 @@ public String greeting(@RequestParam(name="name", required=false, defaultValue="
     }
 
     @GetMapping("/home")
-    public String home() {
+    public String home(Model model) {
+        model.addAttribute("title","Home");
         return "home";
     }
 
-    @ModelAttribute("title")
-    public String getTitle(){
-        return "Home";
-    }
+   // @ModelAttribute("title")
+   // public String getTitle(){
+    //    return "Home";
+    //}
 
 }
diff --git a/src/main/resources/templates/node/license/all.html b/src/main/resources/templates/node/license/all.html
@@ -4,19 +4,19 @@
     <title th:replace="${title}">Nodes</title>
 </head>
 <body th:insert="template :: tw_body">
-
-<div class="container" th:replace="template :: tw_main_app">
-    <!-- Example row of columns -->
-    <div class="row">
-        <div class="col-md-12">
-            <h2>All Licenses:</h2>
-            <hr/>
-            <ul th:each="item : ${all}">
-                <li th:text="${item.name}" />
-            </ul>
+    <main role="main" th:insert="template :: tw_main">
+        <div class="container" th:replace="template :: tw_main_app">
+            <!-- Example row of columns -->
+            <div class="row">
+                <div class="col-md-12">
+                    <h2>All Licenses:</h2>
+                    <hr/>
+                    <ul th:each="item : ${all}">
+                        <li th:text="${item.name}" />
+                    </ul>
+                </div>
+            </div>
         </div>
-    </div>
-</div>
-
+    </main>
 </body>
 </html>
