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

#576 - use static access

parent a5aefb37
No related branches found
No related tags found
No related merge requests found
...@@ -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", WebRequest.SCOPE_SESSION); request.removeAttribute("database", RequestAttributes.SCOPE_SESSION);
request.removeAttribute("importTemplates", WebRequest.SCOPE_SESSION); request.removeAttribute("importTemplates", RequestAttributes.SCOPE_SESSION);
request.removeAttribute("importCharts", WebRequest.SCOPE_SESSION); request.removeAttribute("importCharts", RequestAttributes.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, WebRequest.SCOPE_SESSION); request.setAttribute("database", database, RequestAttributes.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", WebRequest.SCOPE_SESSION)); model.addAttribute("database", request.getAttribute("database", RequestAttributes.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, WebRequest.SCOPE_SESSION); request.setAttribute("importTemplates", importTemplates, RequestAttributes.SCOPE_SESSION);
request.setAttribute("importCharts", importCharts, WebRequest.SCOPE_SESSION); request.setAttribute("importCharts", importCharts, RequestAttributes.SCOPE_SESSION);
model.addAttribute("database", request.getAttribute("database", WebRequest.SCOPE_SESSION)); model.addAttribute("database", request.getAttribute("database", RequestAttributes.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", WebRequest.SCOPE_SESSION)); model.addAttribute("database", request.getAttribute("database", RequestAttributes.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", WebRequest.SCOPE_SESSION); final Database database = (Database) request.getAttribute("database", RequestAttributes.SCOPE_SESSION);
request.removeAttribute("database", RequestAttributes.SCOPE_SESSION); request.removeAttribute("database", RequestAttributes.SCOPE_SESSION);
final Boolean importTemplates = (Boolean) request.getAttribute("importTemplates", WebRequest.SCOPE_SESSION); final Boolean importTemplates = (Boolean) request.getAttribute("importTemplates", RequestAttributes.SCOPE_SESSION);
request.removeAttribute("importTemplates", RequestAttributes.SCOPE_SESSION); request.removeAttribute("importTemplates", RequestAttributes.SCOPE_SESSION);
final Boolean importCharts = (Boolean) request.getAttribute("importCharts", WebRequest.SCOPE_SESSION); final Boolean importCharts = (Boolean) request.getAttribute("importCharts", RequestAttributes.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);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment