Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
BudgetMaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
PlayWallDesktop wird heute 10 Jahre alt!
Show more breadcrumbs
Robert Goldmann
BudgetMaster
Commits
7b679c53
Commit
7b679c53
authored
Oct 14, 2018
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
Fixed #329 - categories "NONE" and "REST" deletable after edit
parent
a46c6ad0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#255
passed
Oct 14, 2018
Stage: build
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java
+4
-1
4 additions, 1 deletion
...adlocker8/budgetmaster/controller/CategoryController.java
src/main/resources/templates/categories/newCategory.ftl
+2
-1
2 additions, 1 deletion
src/main/resources/templates/categories/newCategory.ftl
with
6 additions
and
2 deletions
src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java
+
4
−
1
View file @
7b679c53
...
@@ -127,8 +127,11 @@ public class CategoryController
...
@@ -127,8 +127,11 @@ public class CategoryController
return
"categories/newCategory"
;
return
"categories/newCategory"
;
}
}
else
else
{
if
(
category
.
getType
()
==
null
)
{
{
category
.
setType
(
CategoryType
.
CUSTOM
);
category
.
setType
(
CategoryType
.
CUSTOM
);
}
categoryRepository
.
save
(
category
);
categoryRepository
.
save
(
category
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/main/resources/templates/categories/newCategory.ftl
+
2
−
1
View file @
7b679c53
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
<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
()}
</#if>">
<input type="hidden" name="type" value="<#if category.getType()??>$
{
category
.getType
()}
</#if>">
<#-- name -->
<#-- name -->
<div class="row">
<div class="row">
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment