Skip to content

Commit 951fd7a

Browse files
thomaswoehlkethomaswoehlke
committed
refactoring of java classes
1 parent b5a5767 commit 951fd7a

File tree

12 files changed

+12
-13
lines changed

12 files changed

+12
-13
lines changed

‎src/main/java/org/woehlke/simpleworklist/domain/chat/ChatMessageRepository.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
public interface ChatMessageRepository extends JpaRepository<ChatMessage, Long> {
1818

1919
//TODO: #247 move the JQL Query-String to Entity as Prepared Statement
20-
String JQL = "select m from User2UserMessage m "
20+
String JQL = "select m from ChatMessage m "
2121
+ "where (m.sender = :thisUser and m.receiver = :otherUser) "
2222
+ "or (m.sender = :otherUser and m.receiver = :thisUser)";
2323

‎src/main/java/org/woehlke/simpleworklist/domain/taskworkflow/TaskStateTaskController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public final String addNewTaskToInboxPost(
9292
}
9393
Boolean mustChooseArea = false;
9494
task.setContext(context);
95-
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(TaskState.INBOX,locale, userSession);
95+
Breadcrumb breadcrumb = breadcrumbService.getBreadcrumbForTaskstate(TaskState.INBOX, locale, userSession);
9696
model.addAttribute("mustChooseArea", mustChooseArea);
9797
model.addAttribute("breadcrumb", breadcrumb);
9898
model.addAttribute("task", task);

‎src/main/resources/application.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ server:
66
enabled: false
77
min-response-size: 2048
88
servlet:
9-
context-path: "/simpleworklist"
9+
context-path: "/"
1010
spring:
1111
config:
1212
name: simpleworklist

‎src/main/resources/templates/taskstate/completed.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1 class="col-md-12 mb-12">
3434
th:if="${message} != null" id="mytwcontent-message">
3535
</div>
3636
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
37-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='COMPLETED', myUrlPath='/taskstate')">
37+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='COMPLETED',myUrlPath=@{/taskstate})">
3838
</div>
3939
</div>
4040
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

‎src/main/resources/templates/taskstate/focus.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
3232
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
3333
</div>
3434
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
35-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='FOCUS', myUrlPath='/taskstate')">
35+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='FOCUS', myUrlPath=@{/taskstate})">
3636
</div>
3737
</div>
3838
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

‎src/main/resources/templates/taskstate/inbox.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
3232
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
3333
</div>
3434
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
35-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='INBOX', myUrlPath='/taskstate')">
35+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='INBOX', myUrlPath=@{/taskstate})">
3636
</div>
3737
</div>
3838
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

‎src/main/resources/templates/taskstate/next.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
3232
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
3333
</div>
3434
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
35-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='NEXT', myUrlPath='/taskstate')">
35+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='NEXT',myUrlPath=@{/taskstate})">
3636
</div>
3737
</div>
3838
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

‎src/main/resources/templates/taskstate/scheduled.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
3232
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
3333
</div>
3434
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
35-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SCHEDULED', myUrlPath='/taskstate')">
35+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SCHEDULED',myUrlPath=@{/taskstate})">
3636
</div>
3737
</div>
3838
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

‎src/main/resources/templates/taskstate/someday.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
3232
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
3333
</div>
3434
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
35-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SOMEDAY', myUrlPath='/taskstate')">
35+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='SOMEDAY',myUrlPath=@{/taskstate})">
3636
</div>
3737
</div>
3838
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

‎src/main/resources/templates/taskstate/today.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h1 class="col-md-12 mb-12">
3232
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
3333
</div>
3434
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
35-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TODAY', myUrlPath='/taskstate')">
35+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TODAY',myUrlPath=@{/taskstate})">
3636
</div>
3737
</div>
3838
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

‎src/main/resources/templates/taskstate/trash.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ <h1 class="col-md-12 mb-12">
3434
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
3535
</div>
3636
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
37-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TRASHED', myUrlPath='/taskstate')">
37+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='TRASHED',myUrlPath=@{/taskstate})">
3838
</div>
3939
</div>
4040
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">

‎src/main/resources/templates/taskstate/waiting.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,13 @@ <h1 class="col-md-12 mb-12">
3232
<div th:replace="layout/tasks :: tw-tasks-message(message=${message})" th:if="${message} != null" id="mytwcontent-message">
3333
</div>
3434
<div th:if="${taskPage.getTotalElements() gt 0}" id="mytwcontent-taskpage">
35-
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='WAITING', myUrlPath='/taskstate')">
35+
<div th:replace="layout/tasks :: tw-tasks-table(taskPage=${taskPage},myTaskState='WAITING',myUrlPath=@{/taskstate})">
3636
</div>
3737
</div>
3838
<div th:if="${taskPage.getTotalElements() eq 0}" id="mytwcontent-no-taskpage">
3939
<p><span th:text="#{tasks.waiting.noTasks}">You are not waiting for others</span></p>
4040
</div>
4141
</div>
4242

43-
4443
</body>
4544
</html>

0 commit comments

Comments
 (0)