diff --git a/src/clj/ataru/email/application_email.clj b/src/clj/ataru/email/application_email.clj index f4745ab608..0313102aa5 100644 --- a/src/clj/ataru/email/application_email.clj +++ b/src/clj/ataru/email/application_email.clj @@ -249,7 +249,7 @@ template-params {:hakukohteet (hakukohde-names tarjonta-info lang application) :application-oid (:key application) :application-url application-url - :application-url-text application-url-text + :application-url-text (->safe-html application-url-text) :oma-opintopolku-link oma-opintopolku-link :payment-url payment-url :content content diff --git a/src/clj/ataru/email/email_util.clj b/src/clj/ataru/email/email_util.clj index 6e0e54380b..3608e4510d 100644 --- a/src/clj/ataru/email/email_util.clj +++ b/src/clj/ataru/email/email_util.clj @@ -57,6 +57,7 @@ (get-in [:public-config :applicant :service_url]) (str "/hakemus?modify=" secret))) +;Vahvasti tunnistautunut saa linkin oma-opintopolkuun, muut saavat suoran muokkauslinkin hakemukselle ja siihen liittyvän ohjetekstin. (defn get-application-url-and-text [form application lang] (let [form-allows-ht? (boolean (get-in form [:properties :allow-hakeminen-tunnistautuneena])) strong-auth? (= (:tunnistautuminen application) constants/auth-type-strong)] diff --git a/src/clj/ataru/information_request/information_request_service.clj b/src/clj/ataru/information_request/information_request_service.clj index 739913743a..371f7e5855 100644 --- a/src/clj/ataru/information_request/information_request_service.clj +++ b/src/clj/ataru/information_request/information_request_service.clj @@ -44,12 +44,14 @@ (extract-answer-value "guardian-email-secondary" application)]))) (remove string/blank? [(extract-answer-value "email" application)])) translations (translations/get-translations lang) - url-and-link (email-util/get-application-url-and-text form application lang) + {:keys [application-url application-url-text oma-opintopolku-link]} (email-util/get-application-url-and-text form application lang) body (selmer/render-file (information-request-email-template-filename lang) (merge {:message (->safe-html (:message information-request))} (if (or guardian? (not add-update-link?)) {} - url-and-link) + {:application-url application-url + :application-url-text (->safe-html application-url-text) + :oma-opintopolku-link oma-opintopolku-link}) translations)) subject-with-application-key (email-util/enrich-subject-with-application-key-and-limit-length (:subject information-request) (:application-key information-request) lang)]