Skip to content

Commit f8cd877

Browse files
committed
List of ALL Tasks
1 parent 3c8b557 commit f8cd877

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

src/main/java/org/woehlke/java/simpleworklist/domain/PagesController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
@Slf4j
1515
@Controller
16-
@RequestMapping(path = "/")
16+
@RequestMapping(path = "/pages")
1717
public class PagesController extends AbstractController {
1818

1919
@RequestMapping(path = "/information", method = RequestMethod.GET)

src/main/java/org/woehlke/java/simpleworklist/domain/meso/session/UserSessionBean.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,31 @@ public class UserSessionBean implements Serializable {
2727
private String lastSearchterm; //TODO: Make SearchRequest to Entity
2828

2929
public UserSessionBean(){
30-
this.lastSearchterm=""; //TODO: Make SearchRequest to Entity
31-
this.lastTaskState=TaskState.INBOX;
32-
this.lastProjectId=0L;
30+
this.userAccountid=0L;
3331
this.lastContextId=0L;
32+
this.lastProjectId=0L;
3433
this.lastTaskId=0L;
35-
this.userAccountid=0L;
34+
this.lastTaskState=TaskState.INBOX;
35+
this.lastSearchterm=""; //TODO: Make SearchRequest to Entity
3636
}
3737

3838
public UserSessionBean(long userAccountid, long lastContextId){
39-
this.lastSearchterm=""; //TODO: Make SearchRequest to Entity
40-
this.lastTaskState=TaskState.INBOX;
41-
this.lastProjectId=0L;
42-
this.lastTaskId=0L;
4339
this.userAccountid=userAccountid;
4440
this.lastContextId=lastContextId;
41+
this.lastProjectId=0L;
42+
this.lastTaskId=0L;
43+
this.lastTaskState=TaskState.INBOX;
44+
this.lastSearchterm=""; //TODO: Make SearchRequest to Entity
4545
}
4646

4747
@Deprecated
4848
public UserSessionBean(long contextId){
49-
this.lastContextId = contextId;
50-
lastSearchterm=""; //TODO: Make SearchRequest to Entity
51-
lastTaskState=TaskState.INBOX;
52-
lastProjectId=0L;
53-
lastTaskId=0L;
54-
userAccountid=0L;
49+
this.userAccountid=0L;
50+
this.lastContextId=contextId;
51+
this.lastProjectId=0L;
52+
this.lastTaskId=0L;
53+
this.lastTaskState=TaskState.INBOX;
54+
this.lastSearchterm=""; //TODO: Make SearchRequest to Entity
5555
}
5656

5757
public void update(long userAccountid, long contextId) {

src/main/resources/application.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,6 @@ org:
104104
antPatternsPublic:
105105
- "/favicon.ico"
106106
- "/favicon.ico*"
107-
- "/information"
108-
- "/information*"
109107
- "/pages/**"
110108
- "/webjars/**"
111109
- "/css/**"

src/main/resources/templates/layout/navbartop.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
</div>
111111
</li>
112112
<li class="nav-item">
113-
<a class="nav-link" th:href="@{/information}">
113+
<a class="nav-link" th:href="@{/pages/information}">
114114
<i class="fa-solid fa-circle-info"></i>
115115
<span th:text="#{pages.information.h1}">information</span>
116116
</a>

src/main/resources/templates/layout/page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
<footer class="footer">
9191
<nav class="navbar fixed-bottom navbar-dark bg-dark navbar-text">
9292
<div class="container">
93-
<div class="col nav-link"><a th:href="@{/information}" class="nav-link">© 2022 Thomas Wöhlke</a></div>
93+
<div class="col nav-link"><a th:href="@{/pages/information}" class="nav-link">© 2022 Thomas Wöhlke</a></div>
9494
<div class="col nav-link">
9595
<a href="https://twitter.com/GustaveSchiller" class="nav-link text-center">
9696
<i class="fa-brands fa-twitter"></i> GustaveSchiller

0 commit comments

Comments
 (0)