diff --git a/wrenchboard/email/JOB/job_offer_invidual.mailfile b/wrenchboard/email/JOB/job_offer_invidual.mailfile index b87276f0..524f30ca 100644 --- a/wrenchboard/email/JOB/job_offer_invidual.mailfile +++ b/wrenchboard/email/JOB/job_offer_invidual.mailfile @@ -105,7 +105,7 @@ Subject: {{subject}} - {{title}} - +
- - - -
Title @@ -123,14 +123,6 @@ Offer ID
- Description - - {{description}} -
Duration diff --git a/wrenchboard/email/JOB/job_offer_sendtome.mailfile b/wrenchboard/email/JOB/job_offer_sendtome.mailfile index baac8ab9..117f23d0 100644 --- a/wrenchboard/email/JOB/job_offer_sendtome.mailfile +++ b/wrenchboard/email/JOB/job_offer_sendtome.mailfile @@ -105,7 +105,7 @@ Subject: {{subject}} - {{title}}
- +
- - - - -
Title @@ -122,15 +122,6 @@ Offer ID {{offer_code}}
- Description - - {{description}} -
Duration diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 95e70453..cb54690b 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -553,7 +553,9 @@ long job_email(long mailtype, CVars in, CVars &out) { case JOBS_OFFER_SENDTOME_MAIL: if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title," - " j.description,j.timeline_days,j.price,o.member_id,j.title,o.offer_code,jo.email AS job_email,to_char(now(), 'yyyy') AS YYYY " + " j.description,j.timeline_days,j.price,o.member_id,j.title, " + " (CASE WHEN o.email IS NULL THEN 'Public View' ELSE o.email END) AS job_email, " + " o.offer_code,to_char(now(), 'yyyy') AS YYYY " " FROM members_jobs_offer o " " LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.offer_code = '%s'", in["offer_code"].c_str())) { vars2form(x, form);