Skip to content
Snippets Groups Projects
Commit b7335846 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #367 - ids must be raw numbers

parent 89cbff81
No related branches found
No related tags found
No related merge requests found
Pipeline #332 passed
Stage: build
Stage: test
Show whitespace changes
Inline Side-by-side
Showing
with 44 additions and 28 deletions
src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java
+ 1
− 0
View file @ b7335846
...@@ -34,6 +34,7 @@ public class CategoryController extends BaseController ...@@ -34,6 +34,7 @@ public class CategoryController extends BaseController
@RequestMapping("/categories") @RequestMapping("/categories")
public String categories(Model model) public String categories(Model model)
{ {
helpers.test();
model.addAttribute("categories", categoryRepository.findAllByOrderByNameAsc()); model.addAttribute("categories", categoryRepository.findAllByOrderByNameAsc());
return "categories/categories"; return "categories/categories";
} }
......
src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+ 15
− 0
View file @ b7335846
...@@ -304,4 +304,19 @@ public class HelpersService ...@@ -304,4 +304,19 @@ public class HelpersService
{ {
return budgetMasterUpdateService.getAvailableVersionString(); return budgetMasterUpdateService.getAvailableVersionString();
} }
public void test()
{
for(int i = 0; i < 1010; i++)
{
Transaction transaction = new Transaction();
transaction.setAccount(getCurrentAccount());
transaction.setDate(DateTime.now());
transaction.setAmount(100);
transaction.setCategory(categoryRepository.findByType(CategoryType.NONE));
transaction.setName("Eimer");
transactionService.getRepository().save(transaction);
}
}
} }
\ No newline at end of file
src/main/resources/templates/accounts/accounts.ftl
+ 3
− 3
View file @ b7335846
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
<tr> <tr>
<td>${account.getName()}</td> <td>${account.getName()}</td>
<td> <td>
<a href="/accounts/${account.getID()}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a> <a href="/accounts/${account.getID()?c}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
<a href="/accounts/${account.getID()}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a> <a href="/accounts/${account.getID()?c}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
</td> </td>
</tr> </tr>
</#if> </#if>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</div> </div>
<div class="modal-footer background-color"> <div class="modal-footer background-color">
<a href="/accounts" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a> <a href="/accounts" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
<a href="/accounts/${currentAccount.getID()}/delete" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("info.button.account.delete")}</a> <a href="/accounts/${currentAccount.getID()?c}/delete" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("info.button.account.delete")}</a>
</div> </div>
</div> </div>
</#if> </#if>
......
src/main/resources/templates/accounts/newAccount.ftl
+ 1
− 1
View file @ b7335846
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<#import "../validation.ftl" as validation> <#import "../validation.ftl" as validation>
<form name="NewAccount" action="/accounts/newAccount" method="post"> <form name="NewAccount" action="/accounts/newAccount" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="<#if account.getID()??>${account.getID()}</#if>"> <input type="hidden" name="ID" value="<#if account.getID()??>${account.getID()?c}</#if>">
<input type="hidden" name="isSelected" value="<#if account.isSelected()??>${account.isSelected()?c}</#if>"> <input type="hidden" name="isSelected" value="<#if account.isSelected()??>${account.isSelected()?c}</#if>">
<#-- name --> <#-- name -->
......
src/main/resources/templates/categories/categories.ftl
+ 3
− 3
View file @ b7335846
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
</td> </td>
<td>${categoryName}</td> <td>${categoryName}</td>
<td> <td>
<a href="/categories/${category.ID}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a> <a href="/categories/${category.ID?c}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
<#if (category.getType().name() == "CUSTOM")> <#if (category.getType().name() == "CUSTOM")>
<a href="/categories/${category.ID}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a> <a href="/categories/${category.ID?c}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
</#if> </#if>
</td> </td>
</tr> </tr>
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
</div> </div>
<div class="modal-footer background-color"> <div class="modal-footer background-color">
<a href="/categories" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a> <a href="/categories" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
<a href="/categories/${currentCategory.ID}/delete" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("delete")}</a> <a href="/categories/${currentCategory.ID?c}/delete" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("delete")}</a>
</div> </div>
</div> </div>
</#if> </#if>
......
src/main/resources/templates/categories/newCategory.ftl
+ 1
− 1
View file @ b7335846
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<#import "../validation.ftl" as validation> <#import "../validation.ftl" as validation>
<form name="NewCategory" action="/categories/newCategory" method="post"> <form name="NewCategory" action="/categories/newCategory" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="<#if category.getID()??>${category.getID()}</#if>"> <input type="hidden" name="ID" value="<#if category.getID()??>${category.getID()?c}</#if>">
<input type="hidden" name="type" value="<#if category.getType()??>${category.getType()}</#if>"> <input type="hidden" name="type" value="<#if category.getType()??>${category.getType()}</#if>">
<#-- name --> <#-- name -->
......
src/main/resources/templates/import.ftl
+ 2
− 2
View file @ b7335846
...@@ -24,14 +24,14 @@ ...@@ -24,14 +24,14 @@
<#list helpers.getAccountMatches(database.getAccounts()) as accountMatch> <#list helpers.getAccountMatches(database.getAccounts()) as accountMatch>
<tr> <tr>
<td class="import-text">${locale.getString("info.database.import.source")}</td> <td class="import-text">${locale.getString("info.database.import.source")}</td>
<td class="account-source-id hidden"><#if accountMatch.getAccountSource().getID()??>${accountMatch.getAccountSource().getID()}<#else>-1</#if> </td> <td class="account-source-id hidden"><#if accountMatch.getAccountSource().getID()??>${accountMatch.getAccountSource().getID()?c}<#else>-1</#if> </td>
<td class="account-source">${accountMatch.getAccountSource().getName()}</td> <td class="account-source">${accountMatch.getAccountSource().getName()}</td>
<td class="import-text">${locale.getString("info.database.import.destination")}</td> <td class="import-text">${locale.getString("info.database.import.destination")}</td>
<td> <td>
<select class="account-destination"> <select class="account-destination">
<#list availableAccounts as account> <#list availableAccounts as account>
<#if (account.getType().name() == "CUSTOM")> <#if (account.getType().name() == "CUSTOM")>
<option value="${account.getID()}">${account.getName()}</option> <option value="${account.getID()?c}">${account.getName()}</option>
</#if> </#if>
</#list> </#list>
</select> </select>
......
src/main/resources/templates/navbar.ftl
+ 2
− 2
View file @ b7335846
...@@ -59,9 +59,9 @@ ...@@ -59,9 +59,9 @@
<select id="selectAccount"> <select id="selectAccount">
<#list helpers.getAllAccounts() as account> <#list helpers.getAllAccounts() as account>
<#if (account.getType().name() == "ALL")> <#if (account.getType().name() == "ALL")>
<option <#if account.isSelected()>selected</#if> value="${account.getID()}">${locale.getString("account.all")}</option> <option <#if account.isSelected()>selected</#if> value="${account.getID()?c}">${locale.getString("account.all")}</option>
<#else> <#else>
<option <#if account.isSelected()>selected</#if> value="${account.getID()}">${account.getName()}</option> <option <#if account.isSelected()>selected</#if> value="${account.getID()?c}">${account.getName()}</option>
</#if> </#if>
</#list> </#list>
</select> </select>
......
src/main/resources/templates/settings.ftl
+ 1
− 1
View file @ b7335846
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<#import "validation.ftl" as validation> <#import "validation.ftl" as validation>
<form name="Settings" action="/settings/save" method="post"> <form name="Settings" action="/settings/save" method="post">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="${settings.getID()}"> <input type="hidden" name="ID" value="${settings.getID()?c}">
<#-- password --> <#-- password -->
<div class="row"> <div class="row">
......
src/main/resources/templates/transactions/newTransaction.ftl
+ 12
− 12
View file @ b7335846
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<#import "../validation.ftl" as validation> <#import "../validation.ftl" as validation>
<form name="NewTransaction" action="/transactions/newTransaction" method="post" onsubmit="return validateForm()"> <form name="NewTransaction" action="/transactions/newTransaction" method="post" onsubmit="return validateForm()">
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="ID" value="<#if transaction.getID()??>${transaction.getID()}</#if>"> <input type="hidden" name="ID" value="<#if transaction.getID()??>${transaction.getID()?c}</#if>">
<input type="hidden" name="isRepeating" value="${transaction.isRepeating()?c}"> <input type="hidden" name="isRepeating" value="${transaction.isRepeating()?c}">
<#-- isPayment switch --> <#-- isPayment switch -->
...@@ -76,18 +76,18 @@ ...@@ -76,18 +76,18 @@
<div class="input-field col s12 m12 l8 offset-l2" id="categoryWrapper"> <div class="input-field col s12 m12 l8 offset-l2" id="categoryWrapper">
<select id="transaction-category" name="category" <@validation.validation "category"/>> <select id="transaction-category" name="category" <@validation.validation "category"/>>
<#list categories as category> <#list categories as category>
<#assign categoryInfos=categoriesFunctions.getCategoryName(category) + "@@@" + category.getColor() + "@@@" + category.getAppropriateTextColor() + "@@@" + category.getID()> <#assign categoryInfos=categoriesFunctions.getCategoryName(category) + "@@@" + category.getColor() + "@@@" + category.getAppropriateTextColor() + "@@@" + category.getID()?c>
<#if transaction.getCategory()??> <#if transaction.getCategory()??>
<#if transaction.getCategory().getID() == category.getID()> <#if transaction.getCategory().getID()?c == category.getID()?c>
<option selected value="${category.getID()}">${categoryInfos}</option> <option selected value="${category.getID()?c}">${categoryInfos}</option>
<#elseif category.getType() != "REST"> <#elseif category.getType() != "REST">
<option value="${category.getID()}">${categoryInfos}</option> <option value="${category.getID()?c}">${categoryInfos}</option>
</#if> </#if>
<#elseif category.getType() == "NONE"> <#elseif category.getType() == "NONE">
<option selected value="${category.getID()}">${categoryInfos}</option> <option selected value="${category.getID()?c}">${categoryInfos}</option>
<#elseif category.getType() != "REST"> <#elseif category.getType() != "REST">
<option value="${category.getID()}">${categoryInfos}</option> <option value="${category.getID()?c}">${categoryInfos}</option>
</#if> </#if>
</#list> </#list>
</select> </select>
...@@ -136,12 +136,12 @@ ...@@ -136,12 +136,12 @@
<#list accounts as account> <#list accounts as account>
<#if (account.getType().name() == "CUSTOM")> <#if (account.getType().name() == "CUSTOM")>
<#if transaction.getAccount()?? && transaction.getAccount() == account> <#if transaction.getAccount()?? && transaction.getAccount() == account>
<option selected value="${account.getID()}">${account.getName()}</option> <option selected value="${account.getID()?c}">${account.getName()}</option>
<#else> <#else>
<#if account == helpers.getCurrentAccount()> <#if account == helpers.getCurrentAccount()>
<option selected value="${account.getID()}">${account.getName()}</option> <option selected value="${account.getID()?c}">${account.getName()}</option>
<#else> <#else>
<option value="${account.getID()}">${account.getName()}</option> <option value="${account.getID()?c}">${account.getName()}</option>
</#if> </#if>
</#if> </#if>
</#if> </#if>
...@@ -319,9 +319,9 @@ ...@@ -319,9 +319,9 @@
<#-- pass selected account to JS in order to select current value for materialize select --> <#-- pass selected account to JS in order to select current value for materialize select -->
<script> <script>
<#if transaction.getCategory()??> <#if transaction.getCategory()??>
selectedCategory = "${transaction.getCategory().getID()}"; selectedCategory = "${transaction.getCategory().getID()?c}";
<#else> <#else>
selectedCategory = "${helpers.getIDOfNoCatgeory()}"; selectedCategory = "${helpers.getIDOfNoCatgeory()?c}";
</#if> </#if>
</script> </script>
......
src/main/resources/templates/transactions/transactions.ftl
+ 3
− 3
View file @ b7335846
...@@ -69,8 +69,8 @@ ...@@ -69,8 +69,8 @@
</#if> </#if>
<td> <td>
<#if (transaction.category.type.name() != "REST")> <#if (transaction.category.type.name() != "REST")>
<a href="/transactions/${transaction.ID}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a> <a href="/transactions/${transaction.ID?c}/edit" class="btn-flat no-padding text-color"><i class="material-icons left">edit</i></a>
<a href="/transactions/${transaction.ID}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a> <a href="/transactions/${transaction.ID?c}/requestDelete" class="btn-flat no-padding text-color"><i class="material-icons left">delete</i></a>
</#if> </#if>
</td> </td>
</tr> </tr>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</div> </div>
<div class="modal-footer background-color"> <div class="modal-footer background-color">
<a href="/transactions" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a> <a href="/transactions" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
<a href="/transactions/${currentTransaction.ID}/delete" class="modal-action modal-close waves-effectwaves-light green btn-flat white-text">${locale.getString("delete")}</a> <a href="/transactions/${currentTransaction.ID?c}/delete" class="modal-action modal-close waves-effectwaves-light green btn-flat white-text">${locale.getString("delete")}</a>
</div> </div>
</div> </div>
</#if> </#if>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment