Skip to content

Commit a918661

Browse files
committed
Change forms
1 parent 9f86125 commit a918661

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormComponent.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class FormComponent(
4242
langRejected,
4343
langAccepted,
4444
langGroupInsufficient,
45-
langNoSubmission
45+
langNoSubmission,
46+
langMessageFromOrganizers,
4647
)
4748
}
4849

@@ -112,4 +113,9 @@ class FormComponent(
112113
fieldName = "'Nincs leadott jelentkezés' szöveg", description = "Akkor jelenik meg amikor kitölthető a jelentkezés."
113114
)
114115

116+
val langMessageFromOrganizers = SettingProxy(componentSettingService, component,
117+
"langMessageFromOrganizers", "**Üzenet a rendezőktől:**", type = SettingType.TEXT,
118+
fieldName = "Visszadobás üzenet fejléce", description = "Ha egy rendező visszadobja a profilt, akkor jelenik meg."
119+
)
120+
115121
}

backend/src/main/kotlin/hu/bme/sch/cmsch/component/form/FormService.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ open class FormService(
2727
private val clock: TimeService,
2828
private val objectMapper: ObjectMapper,
2929
private val debugComponent: DebugComponent,
30-
private val listeners: List<FormSubmissionListener>,
30+
private val listeners: MutableList<out FormSubmissionListener>,
31+
private val formComponent: FormComponent,
3132
) {
3233

3334
internal val log = LoggerFactory.getLogger(javaClass)
@@ -102,10 +103,9 @@ open class FormService(
102103
submission = submittedFields,
103104
detailsValidated = entity.detailsValidated,
104105
status = FormStatus.SUBMITTED,
105-
// TODO: Remove hardcoded string
106106
message = form.submittedMessage
107107
+ (if (!entity.detailsValidated && entity.rejectionMessage.isNotBlank())
108-
("\n\n**Üzenet a rendezőktől:** " + entity.rejectionMessage) else "")
108+
("\n\n " + formComponent.langMessageFromOrganizers.getValue() + entity.rejectionMessage) else "")
109109
)
110110
}
111111
}

0 commit comments

Comments
 (0)