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
Show more breadcrumbs
Robert Goldmann
BudgetMaster
Commits
5974878c
Commit
5974878c
authored
Apr 25, 2021
by
Robert Goldmann
Browse files
Options
Downloads
Patches
Plain Diff
#576 - use static access
parent
a5aefb37
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+12
-12
12 additions, 12 deletions
...deadlocker8/budgetmaster/settings/SettingsController.java
with
12 additions
and
12 deletions
src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+
12
−
12
View file @
5974878c
...
@@ -81,9 +81,9 @@ public class SettingsController extends BaseController
...
@@ -81,9 +81,9 @@ public class SettingsController extends BaseController
public
String
settings
(
WebRequest
request
,
Model
model
)
public
String
settings
(
WebRequest
request
,
Model
model
)
{
{
prepareBasicModel
(
model
,
settingsService
.
getSettings
());
prepareBasicModel
(
model
,
settingsService
.
getSettings
());
request
.
removeAttribute
(
"database"
,
Web
Request
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"database"
,
Request
Attributes
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"importTemplates"
,
Web
Request
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"importTemplates"
,
Request
Attributes
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"importCharts"
,
Web
Request
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"importCharts"
,
Request
Attributes
.
SCOPE_SESSION
);
return
"settings/settings"
;
return
"settings/settings"
;
}
}
...
@@ -262,7 +262,7 @@ public class SettingsController extends BaseController
...
@@ -262,7 +262,7 @@ public class SettingsController extends BaseController
DatabaseParser
importer
=
new
DatabaseParser
(
jsonString
,
categoryService
.
findByType
(
CategoryType
.
NONE
));
DatabaseParser
importer
=
new
DatabaseParser
(
jsonString
,
categoryService
.
findByType
(
CategoryType
.
NONE
));
Database
database
=
importer
.
parseDatabaseFromJSON
();
Database
database
=
importer
.
parseDatabaseFromJSON
();
request
.
setAttribute
(
"database"
,
database
,
Web
Request
.
SCOPE_SESSION
);
request
.
setAttribute
(
"database"
,
database
,
Request
Attributes
.
SCOPE_SESSION
);
return
"redirect:/settings/database/import/step1"
;
return
"redirect:/settings/database/import/step1"
;
}
}
catch
(
Exception
e
)
catch
(
Exception
e
)
...
@@ -278,7 +278,7 @@ public class SettingsController extends BaseController
...
@@ -278,7 +278,7 @@ public class SettingsController extends BaseController
@GetMapping
(
"/database/import/step1"
)
@GetMapping
(
"/database/import/step1"
)
public
String
importStepOne
(
WebRequest
request
,
Model
model
)
public
String
importStepOne
(
WebRequest
request
,
Model
model
)
{
{
model
.
addAttribute
(
"database"
,
request
.
getAttribute
(
"database"
,
Web
Request
.
SCOPE_SESSION
));
model
.
addAttribute
(
"database"
,
request
.
getAttribute
(
"database"
,
Request
Attributes
.
SCOPE_SESSION
));
return
"settings/importStepOne"
;
return
"settings/importStepOne"
;
}
}
...
@@ -287,10 +287,10 @@ public class SettingsController extends BaseController
...
@@ -287,10 +287,10 @@ public class SettingsController extends BaseController
@RequestParam
(
value
=
"TEMPLATE"
,
required
=
false
)
boolean
importTemplates
,
@RequestParam
(
value
=
"TEMPLATE"
,
required
=
false
)
boolean
importTemplates
,
@RequestParam
(
value
=
"CHART"
,
required
=
false
)
boolean
importCharts
)
@RequestParam
(
value
=
"CHART"
,
required
=
false
)
boolean
importCharts
)
{
{
request
.
setAttribute
(
"importTemplates"
,
importTemplates
,
Web
Request
.
SCOPE_SESSION
);
request
.
setAttribute
(
"importTemplates"
,
importTemplates
,
Request
Attributes
.
SCOPE_SESSION
);
request
.
setAttribute
(
"importCharts"
,
importCharts
,
Web
Request
.
SCOPE_SESSION
);
request
.
setAttribute
(
"importCharts"
,
importCharts
,
Request
Attributes
.
SCOPE_SESSION
);
model
.
addAttribute
(
"database"
,
request
.
getAttribute
(
"database"
,
Web
Request
.
SCOPE_SESSION
));
model
.
addAttribute
(
"database"
,
request
.
getAttribute
(
"database"
,
Request
Attributes
.
SCOPE_SESSION
));
model
.
addAttribute
(
"availableAccounts"
,
accountService
.
getAllAccountsAsc
());
model
.
addAttribute
(
"availableAccounts"
,
accountService
.
getAllAccountsAsc
());
return
"redirect:/settings/database/import/step2"
;
return
"redirect:/settings/database/import/step2"
;
}
}
...
@@ -298,7 +298,7 @@ public class SettingsController extends BaseController
...
@@ -298,7 +298,7 @@ public class SettingsController extends BaseController
@GetMapping
(
"/database/import/step2"
)
@GetMapping
(
"/database/import/step2"
)
public
String
importStepTwo
(
WebRequest
request
,
Model
model
)
public
String
importStepTwo
(
WebRequest
request
,
Model
model
)
{
{
model
.
addAttribute
(
"database"
,
request
.
getAttribute
(
"database"
,
Web
Request
.
SCOPE_SESSION
));
model
.
addAttribute
(
"database"
,
request
.
getAttribute
(
"database"
,
Request
Attributes
.
SCOPE_SESSION
));
model
.
addAttribute
(
"availableAccounts"
,
accountService
.
getAllAccountsAsc
());
model
.
addAttribute
(
"availableAccounts"
,
accountService
.
getAllAccountsAsc
());
return
"settings/importStepTwo"
;
return
"settings/importStepTwo"
;
}
}
...
@@ -306,13 +306,13 @@ public class SettingsController extends BaseController
...
@@ -306,13 +306,13 @@ public class SettingsController extends BaseController
@PostMapping
(
"/database/import/step3"
)
@PostMapping
(
"/database/import/step3"
)
public
String
importDatabase
(
WebRequest
request
,
@ModelAttribute
(
"Import"
)
AccountMatchList
accountMatchList
,
Model
model
)
public
String
importDatabase
(
WebRequest
request
,
@ModelAttribute
(
"Import"
)
AccountMatchList
accountMatchList
,
Model
model
)
{
{
final
Database
database
=
(
Database
)
request
.
getAttribute
(
"database"
,
Web
Request
.
SCOPE_SESSION
);
final
Database
database
=
(
Database
)
request
.
getAttribute
(
"database"
,
Request
Attributes
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"database"
,
RequestAttributes
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"database"
,
RequestAttributes
.
SCOPE_SESSION
);
final
Boolean
importTemplates
=
(
Boolean
)
request
.
getAttribute
(
"importTemplates"
,
Web
Request
.
SCOPE_SESSION
);
final
Boolean
importTemplates
=
(
Boolean
)
request
.
getAttribute
(
"importTemplates"
,
Request
Attributes
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"importTemplates"
,
RequestAttributes
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"importTemplates"
,
RequestAttributes
.
SCOPE_SESSION
);
final
Boolean
importCharts
=
(
Boolean
)
request
.
getAttribute
(
"importCharts"
,
Web
Request
.
SCOPE_SESSION
);
final
Boolean
importCharts
=
(
Boolean
)
request
.
getAttribute
(
"importCharts"
,
Request
Attributes
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"importCharts"
,
RequestAttributes
.
SCOPE_SESSION
);
request
.
removeAttribute
(
"importCharts"
,
RequestAttributes
.
SCOPE_SESSION
);
final
Map
<
EntityType
,
Integer
>
numberOfImportedEntitiesByType
=
importService
.
importDatabase
(
database
,
accountMatchList
,
importTemplates
,
importCharts
);
final
Map
<
EntityType
,
Integer
>
numberOfImportedEntitiesByType
=
importService
.
importDatabase
(
database
,
accountMatchList
,
importTemplates
,
importCharts
);
...
...
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