Skip to content
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.

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

Fix leftover typos #245

Merged
merged 1 commit into from
Dec 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docker/compose/README.TXT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
In progress

Dirctories:
Directories:
project/
├── ProjectForge/ # Application
├── ProjectForge/database # Database
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public List<ToDoDO> select(final BaseSearchFilter filter) {
}

/**
* Sends an e-mail to the projekt manager if exists and is not equals to the logged in user.
* Sends an e-mail to the project manager if exists and is not equals to the logged in user.
*/
public void sendNotification(final ToDoDO todo, final String requestUrl) {
if (!configurationService.isSendMailConfigured()) {
Expand Down Expand Up @@ -181,7 +181,7 @@ public void sendNotification(final ToDoDO todo, final String requestUrl) {
sendNotification(todo.getReporter(), todo, data, true);
}
if (userId != assigneeId && userId != reporterId && !hasUserSelectAccess(user, todo, false)) {
// User is whether reporter nor assignee, so send e-mail (in the case the user hasn't read access anymore).
// User is neither reporter nor assignee, so send e-mail (in the case the user has no read access anymore).
sendNotification(ThreadLocalUserContext.getLoggedInUser(), todo, data, false);
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ open class ConfigurationService {
}
if (inputStream == null) {
log.error(
"File '" + filename + "' not found (whether in file system under '" + base.absolutePath
"File '" + filename + "' not found (neither in file system under '" + base.absolutePath
+ "' nor in resource!)"
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ class GroovyEngine @JvmOverloads constructor(
if (template == null) {
log.error(
"Template with filename '" + file
+ "' not found (whether in resource path nor in ProjectForge's application dir."
+ "' not found (neither in resource path nor in ProjectForge's application dir."
)
return ""
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ open class CollectionHandler : CandHIHandler {
val behavior = AnnotationsUtils.getAnnotation(property, PersistenceBehavior::class.java)
log.debug { "writeInsertHistoryEntriesForNewCollectionEntries: srcEntry of src-collection is BaseDO. autoUpdateCollectionEntres = ${behavior?.autoUpdateCollectionEntries == true}" }
if (behavior?.autoUpdateCollectionEntries == true) {
// No, we have to handle the child collections of all exisiting collection entries:
// No, we have to handle the child collections of all existing collection entries:
// Example: RechnungDO -> list of RechnungPositionDO -> list of KostZuweisungDO.
mergedCol.forEach { mergedEntry ->
if (Hibernate.isInitialized(mergedEntry) && mergedEntry.id != null) {
Expand Down
Loading