Merge pull request #44 from NikitaMic/EmailInputSpeichern

Email gets Reseteted after adding Questions
micromata · Oct 16, 2024 · df445af · df445af
2 parents 0e8ba26 + 5b7e18c
commit df445af
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/projectforge-business/src/main/resources/I18nResources.properties b/projectforge-business/src/main/resources/I18nResources.properties
@@ -1975,8 +1975,6 @@ plugins.teamcal.title.heading=Calendar
 plugins.teamcal.title.list=List of calendars
 
 # poll plugin
-poll.email-content-field=Email Content
-poll.email-subject-field=Email Subject
 poll=Poll
 poll.access=Access
 poll.Annotations=Annotations
@@ -1999,6 +1997,8 @@ poll.date=Date
 poll.deadline=Deadline
 poll.delegationAnswers=Answers of
 poll.description=Description
+poll.email-content-field=Email Content
+poll.email-subject-field=Email Subject
 poll.email-subject-tooltip=Here you can choose the subject of the email yourself. Use {0} to insert the survey title and {1} to set the automatic end date of the survey - which is the deadline for voting. \
 poll.email-content-tooltip=Here you can determine the content of the email yourself. Use {0} to call the survey title. With {1}, you can display the survey creator, with {2} you create a direct link to the survey.\
   \ Use {3} to retrieve the survey description, and {4} to automatically retrieve the end date of the survey, i.e., the deadline for voting.

diff --git a/projectforge-business/src/main/resources/I18nResources_de.properties b/projectforge-business/src/main/resources/I18nResources_de.properties
@@ -65,6 +65,7 @@ SingleResponseQuestion=Frage mit einer Ankreuzm�glichkeit
 poll.TextQuestion=Frage mit freier text Antwort
 calendar.view.oldVersion=Alte Version
 calendar.view.oldVersion.tooltip=Die alte Version wird demnächst entfernt.
+
 # Missed translations from default 'I18nResources.properties' (might be OK):
 #
 # exception.notYetSupported=Not yet supported.
@@ -2133,8 +2134,6 @@ plugins.teamcal.title.heading=Kalender
 plugins.teamcal.title.list=Kalenderliste
 
 # poll plugin
-poll.email-content-field=Email Inhalt
-poll.email-subject-field=Email Titel
 poll=Umfrage
 poll.access=Zugriff
 poll.Annotations=Anmerkungen
@@ -2157,6 +2156,8 @@ poll.date=Datum
 poll.deadline=Antwortfrist
 poll.delegationAnswers=Antworten von
 poll.description=Beschreibung
+poll.email-content-field=Email Inhalt
+poll.email-subject-field=Email Titel
 poll.email-subject-tooltip= Hier kannst du den Betreff der E-Mail selbst w�hlen. Verwende {0}, um den Titel der Umfrage einzuf�gen, und {1}, um das automatische Enddatum der Umfrage zu setzen -\
   \ das ist die Deadline f�r die Abstimmung.
 poll.error.oneQuestionRequired=Mindestens eine Frage ist erforderlich.

diff --git a/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollPageRest.kt b/projectforge-rest/src/main/kotlin/org/projectforge/rest/poll/PollPageRest.kt
@@ -385,10 +385,15 @@ class PollPageRest : AbstractDTOPagesRest<PollDO, Poll, PollDao>(PollDao::class.
                 "\n" +
                 "Mit Freundlichen Grüßen\n" +
                 "{1}"
-        dto.customemailcontent = content
+        if (dto.customemailcontent.isNullOrEmpty()) {
+            dto.customemailcontent = content
+        }
+
+        val subject = "Sie wurden zu einer Umfrage mit dem Titel '{0}' eingeladen."
 
-        val subject = "Sie wurden zu einer Umfrage eingeladen mit dem Titel '{0}' eingeladen."
-        dto.customemailsubject = subject
+        if (dto.customemailsubject.isNullOrEmpty()) {
+            dto.customemailsubject = subject
+        }
 
         addQuestionFieldset(layout, dto, fieldset)