From 8299ab3a658b2cfb4d176b0fd0c9558535de7f3f Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 11 Aug 2019 23:10:09 +0200
Subject: [PATCH] Fixed #478 - error if passwords doesn't match on settings
saved; fixed validation color
---
.../budgetmaster/settings/SettingsController.java | 10 +++++-----
src/main/resources/static/css/dark/style.css | 3 +++
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
index ce0005174..e9578f38c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
@@ -93,6 +93,11 @@ public class SettingsController extends BaseController
bindingResult.addError(error);
}
+ if(settings.getBackupReminderActivated() == null)
+ {
+ settings.setBackupReminderActivated(false);
+ }
+
if(bindingResult.hasErrors())
{
model.addAttribute("error", bindingResult);
@@ -111,11 +116,6 @@ public class SettingsController extends BaseController
userRepository.save(user);
}
- if(settings.getBackupReminderActivated() == null)
- {
- settings.setBackupReminderActivated(false);
- }
-
settingsRepository.delete(0);
settingsRepository.save(settings);
diff --git a/src/main/resources/static/css/dark/style.css b/src/main/resources/static/css/dark/style.css
index c0f117c2f..b0ff8c050 100644
--- a/src/main/resources/static/css/dark/style.css
+++ b/src/main/resources/static/css/dark/style.css
@@ -218,6 +218,9 @@ ul.sidenav.sidenav-fixed > li:last-child
/* input password color */
.input-field input[type=password] {
color: #FFFFFF !important;
+}
+
+.input-field input[type=password]:not(.invalid) {
border-bottom: 1px solid #FFFFFF !important;
box-shadow: 0 1px 0 0 #CCCCCC !important;
}
--
GitLab