Skip to content

Make validation optional for saving library properties preferences #13488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Siedlerchr merged 4 commits into from
Jul 14, 2025
Merged

Make validation optional for saving library properties preferences #13488

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c22185f
Make validation optional for saving library properties preferences an…
paudelritij Jul 7, 2025
eb316a6
- Add CHANGELOG.md entry
paudelritij Jul 7, 2025
7fda827
Merge branch 'main' into enhancement/optional-validation-preferences
paudelritij Jul 7, 2025
0107bf9
Merge branch 'main' into enhancement/optional-validation-preferences
Siedlerchr Jul 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions ...ui/src/main/java/org/jabref/gui/libraryproperties/general/GeneralPropertiesViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,21 +98,21 @@ public void storeSettings() {
String librarySpecificFileDirectory = librarySpecificDirectoryProperty.getValue().trim();
if (librarySpecificFileDirectory.isEmpty()) {
newMetaData.clearLibrarySpecificFileDirectory();
} else {
} else if (librarySpecificFileDirectoryStatus().isValid()) {
newMetaData.setLibrarySpecificFileDirectory(librarySpecificFileDirectory);
}

String userSpecificFileDirectory = userSpecificFileDirectoryProperty.getValue();
if (userSpecificFileDirectory.isEmpty()) {
newMetaData.clearUserFileDirectory(preferences.getFilePreferences().getUserAndHost());
} else {
} else if (userSpecificFileDirectoryStatus().isValid()) {
newMetaData.setUserFileDirectory(preferences.getFilePreferences().getUserAndHost(), userSpecificFileDirectory);
}

String latexFileDirectory = laTexFileDirectoryProperty.getValue();
if (latexFileDirectory.isEmpty()) {
newMetaData.clearLatexFileDirectory(preferences.getFilePreferences().getUserAndHost());
} else {
} else if (laTexFileDirectoryStatus().isValid()) {
newMetaData.setLatexFileDirectory(preferences.getFilePreferences().getUserAndHost(), Path.of(latexFileDirectory));
}

Expand Down Expand Up @@ -231,7 +231,7 @@ private ValidationMessage validateDirectory(String directoryPath, String message
.map(Files::isDirectory)
.orElse(false)) {
return ValidationMessage.error(
Localization.lang("File directory '%0' not found.\nCheck \"%1\" file directory path.", directoryPath, messageKey)
Localization.lang("The file directory '%0' for the %1 file path is not found or is inaccessible.", directoryPath, messageKey)
);
}
} catch (InvalidPathException ex) {
Expand All @@ -245,9 +245,12 @@ private ValidationMessage validateDirectory(String directoryPath, String message

private boolean validateAndShowError(ValidationStatus status) {
if (!status.isValid()) {
status.getHighestMessage().ifPresent(message ->
dialogService.showErrorDialogAndWait(message.getMessage()));
return false;
return status.getHighestMessage()
.map(message -> dialogService.showConfirmationDialogAndWait(
"Action Required: Override Default File Directories",
message.getMessage() + "\n Would you like to save your other preferences?",
"Save", "Return to Properties"))
.orElse(false);
}
return true;
}
Expand Down
2 changes: 1 addition & 1 deletion jablib/src/main/resources/l10n/JabRef_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,7 +1563,7 @@ Clears\ the\ field\ completely.=Clears the field completely.

Main\ file\ directory=Main file directory
Main\ file\ directory\ '%0'\ not\ found.\nCheck\ the\ tab\ "Linked\ files".=Main file directory '%0' not found.\nCheck the tab "Linked files".
File\ directory\ '%0'\ not\ found.\nCheck\ "%1"\ file\ directory\ path.=File directory '%0' not found.\nCheck "%1" file directory path.
The\ file\ directory\ '%0'\ for\ the\ %1\ file\ path\ is\ not\ found\ or\ is\ inaccessible.=The file directory '%0' for the %1 file path is not found or is inaccessible.
Invalid\ path\:\ '%0'.\nCheck\ "%1".=Invalid path: '%0'.\nCheck "%1".
No\ library\ selected=No library selected

Expand Down