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

Fixed #604 - auto backup could not be disabled

parent def14370
No related branches found
No related tags found
No related merge requests found
...@@ -93,10 +93,17 @@ public class SettingsController extends BaseController ...@@ -93,10 +93,17 @@ public class SettingsController extends BaseController
@RequestParam(value = "password") String password, @RequestParam(value = "password") String password,
@RequestParam(value = "passwordConfirmation") String passwordConfirmation, @RequestParam(value = "passwordConfirmation") String passwordConfirmation,
@RequestParam(value = "languageType") String languageType, @RequestParam(value = "languageType") String languageType,
@RequestParam(value = "autoBackupStrategyType") String autoBackupStrategyType) @RequestParam(value = "autoBackupStrategyType", required = false) String autoBackupStrategyType)
{ {
settings.setLanguage(LanguageType.fromName(languageType)); settings.setLanguage(LanguageType.fromName(languageType));
if(autoBackupStrategyType == null)
{
settings.setAutoBackupStrategy(AutoBackupStrategy.NONE);
}
else
{
settings.setAutoBackupStrategy(AutoBackupStrategy.fromName(autoBackupStrategyType)); settings.setAutoBackupStrategy(AutoBackupStrategy.fromName(autoBackupStrategyType));
}
Optional<FieldError> passwordErrorOptional = settingsService.validatePassword(password, passwordConfirmation); Optional<FieldError> passwordErrorOptional = settingsService.validatePassword(password, passwordConfirmation);
if(passwordErrorOptional.isPresent()) if(passwordErrorOptional.isPresent())
......
...@@ -86,6 +86,10 @@ function validateForm() ...@@ -86,6 +86,10 @@ function validateForm()
let autoBackupFilesToKeepValid = validateNumber($('#settings-backup-auto-files-to-keep').val(), "settings-backup-auto-files-to-keep", "hidden-settings-backup-auto-files-to-keep", numberValidationMessageZeroAllowed, REGEX_NUMBER); let autoBackupFilesToKeepValid = validateNumber($('#settings-backup-auto-files-to-keep').val(), "settings-backup-auto-files-to-keep", "hidden-settings-backup-auto-files-to-keep", numberValidationMessageZeroAllowed, REGEX_NUMBER);
return autoBackupDaysValid && autoBackupFilesToKeepValid; return autoBackupDaysValid && autoBackupFilesToKeepValid;
} }
else
{
document.getElementById('settings-backup-auto-strategy').name = '';
}
return true; return true;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment