generated from superdesk/newsroom-app
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix real-time email template for the Calendar section [CPCN-632]
- Loading branch information
1 parent
bd8e5a5
commit e7317b7
Showing
4 changed files
with
159 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,54 @@ | ||
| {{ item.headline or item.name }} | ||
| Voir cet élément dans votre compte: {{ url_for_agenda(item) }} | ||
| {% if item.event %}Quand: {{ dateString }} {{get_event_state(item)}}{% endif %} | ||
| {% if location and location != '' %}Où: {{ location }} | ||
| {% endif %}{% if contacts | length is gt 0 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }} | ||
| {% endfor %} | ||
| {% endif %}{% if links | length is gt 1 %}Web: {% for link in links %}{{ link }} | ||
| {% endfor %} | ||
| Voir cet élément dans votre compte : {{ url_for_agenda(item) }} | ||
| {% if item.event %} | ||
| Quand : {{ dateString }} {{get_event_state(item)}} | ||
| {% endif %} | ||
| {% if item.definition_long or item.definition_short %}Description de l’événement: {{ item.definition_long or item.definition_short }} | ||
|
|
||
| {% if location and location != '' %} | ||
| Où : {{ location }} | ||
| {% endif %} | ||
| {% for planning_item in item.get('planning_items', []) or [] %} | ||
| Élément de couverture: | ||
| {%- if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %} | ||
| Description de l’élément de planification: {{ planning_item.get('description_text') or planning_item.get('name') or '' }} | ||
| {% endif -%} | ||
| {% if planning_item.get('ednote') %}Note de la rédaction: {{ planning_item.get('ednote') }}{% endif %} | ||
| {% if planning_item.get('coverages', []) | length is gt 0 %} | ||
| Couverture: | ||
| {% for cov in get_planning_coverages(item, planning_item._id) %} | ||
| Type de couverture: {{get_coverage_content_type(cov,recipient_language)}} | ||
| Statut de couverture: {{get_coverage_status(cov)}} | ||
| Date et heure d’échéance de la couverture: {{get_coverage_date(cov)}} | ||
| Affecté à: | ||
| {% if cov.get('assigned_desk_name')%}{{cov['assigned_desk_name']}}{% endif %} | ||
| {% if cov.get('assigned_desk_email') %}{{cov['assigned_desk_email']}}{% endif %} | ||
| {% if cov.get('assigned_user_name') %}{{cov['assigned_user_name']}}{% endif %} | ||
| {% if cov.get('assigned_user_email') %}{{cov['assigned_user_email']}}{% endif %} | ||
| {% endfor %} | ||
|
|
||
| {% if contacts | length is gt 0 %} | ||
| Contact : | ||
| {% for contact in contacts %} | ||
| {{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }} | ||
| {% endfor %} | ||
| {% endif %} | ||
|
|
||
| {% if links | length is gt 1 %} | ||
| Web : | ||
| {% for link in links %} | ||
| {{ link }} | ||
| {% endfor %} | ||
| {% endif %} | ||
|
|
||
| {% if item.definition_long or item.definition_short %} | ||
| Description de l’événement : {{ item.definition_long or item.definition_short }} | ||
| {% endif %} | ||
|
|
||
| {% for planning_item in item.get('planning_items', []) or [] %} | ||
| Élément de couverture : | ||
| {%- if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %} | ||
| Description de l’élément de planification : {{ planning_item.get('description_text') or planning_item.get('name') or '' }} | ||
| {% endif -%} | ||
|
|
||
| {% if planning_item.get('ednote') %} | ||
| Note de la rédaction : {{ planning_item.get('ednote') }} | ||
| {% endif %} | ||
|
|
||
| {% if planning_item.get('coverages', []) | length is gt 0 %} | ||
| Couverture : | ||
| {% for cov in get_planning_coverages(item, planning_item._id) %} | ||
| Type de couverture : {{ get_coverage_content_type(cov, recipient_language) }} | ||
| Statut de couverture : {{ get_coverage_status(cov) }} | ||
| Date et heure d’échéance de la couverture : {{ get_coverage_date(cov) }} | ||
| Affecté à : | ||
| {% if cov.get('assigned_desk_name') %}{{ cov['assigned_desk_name'] }}{% endif %} | ||
| {% if cov.get('assigned_desk_email') %}{{ cov['assigned_desk_email'] }}{% endif %} | ||
| {% if cov.get('assigned_user_name') %}{{ cov['assigned_user_name'] }}{% endif %} | ||
| {% if cov.get('assigned_user_email') %}{{ cov['assigned_user_email'] }}{% endif %} | ||
| {% endfor %} | ||
| {% endif %} | ||
| {% endfor %} | ||
| Sujet enregistré: {{ topic_name }} | ||
|
|
||
| Sujet enregistré : {{ topic_name }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,33 +1,56 @@ | ||
| {{ item.headline or item.name }} | ||
| View this item in your account: {{ url_for_agenda(item) }} | ||
| {% if item.event %}When: {{ dateString }} {{get_event_state(item)}}{% endif %} | ||
| {% if location and location != '' %}Where: {{ location }}{% endif %} | ||
| {% if contacts | length is gt 0 %}Contact: {% for contact in contacts %}{{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }} | ||
| {% endfor %} | ||
| {% endif %}{% if links | length is gt 1 %}Web: {% for link in links %}{{ link }} | ||
| {% endfor %} | ||
|
|
||
| View this item in your account : {{ url_for_agenda(item) }} | ||
|
|
||
| {% if item.event %} | ||
| When : {{ dateString }} {{ get_event_state(item) }} | ||
| {% endif %} | ||
| {% if item.definition_long or item.definition_short %}Event description: {{ item.definition_long or item.definition_short }} | ||
|
|
||
| {% if location and location != '' %} | ||
| Where : {{ location }} | ||
| {% endif %} | ||
| {% for planning_item in item.get('planning_items', []) or [] %} | ||
| Planning Item: | ||
| {%- if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %} | ||
| Planning item description: {{ planning_item.get('description_text') or planning_item.get('name') or '' }} | ||
| {% endif -%} | ||
| {% if planning_item.get('ednote') %}Editorial Note: {{ planning_item.get('ednote') }} | ||
| {% endif -%} | ||
| {% if planning_item.get('coverages', []) | length is gt 0 %} | ||
| Coverages: | ||
| {% for cov in get_planning_coverages(item, planning_item._id) %} | ||
| Type of coverage:{{get_coverage_content_type(cov,recipient_language)}} | ||
| Coverage status: {{get_coverage_status(cov)}} | ||
| Coverage due date & time: {{get_coverage_date(cov)}} | ||
| Assigned to: | ||
| {% if cov.get('assigned_desk_name') %}{{cov['assigned_desk_name']}}{% endif %} | ||
| {% if cov.get('assigned_desk_email') %}{{cov['assigned_desk_email']}}{% endif %} | ||
| {% if cov.get('assigned_user_name') %}{{cov['assigned_user_name']}}{% endif %} | ||
| {% if cov.get('assigned_user_email') %}{{cov['assigned_user_email']}}{% endif %} | ||
| {% endfor %} | ||
|
|
||
| {% if contacts | length is gt 0 %} | ||
| Contact : | ||
| {% for contact in contacts %} | ||
| {{ contact.name or contact.organisation }} {{ contact.phone }} {{ contact.mobile }} {{ contact.email }} | ||
| {% endfor %} | ||
| {% endif %} | ||
|
|
||
| {% if links | length is gt 1 %} | ||
| Web : | ||
| {% for link in links %} | ||
| {{ link }} | ||
| {% endfor %} | ||
| {% endif %} | ||
|
|
||
| {% if item.definition_long or item.definition_short %} | ||
| Event description : {{ item.definition_long or item.definition_short }} | ||
| {% endif %} | ||
|
|
||
| {% for planning_item in item.get('planning_items', []) or [] %} | ||
| Planning Item : | ||
| {%- if (planning_item.get('description_text') or planning_item.get('name') or '') != (item.definition_long or item.definition_short) %} | ||
| Planning item description : {{ planning_item.get('description_text') or planning_item.get('name') or '' }} | ||
| {% endif -%} | ||
|
|
||
| {% if planning_item.get('ednote') %} | ||
| Editorial Note : {{ planning_item.get('ednote') }} | ||
| {% endif %} | ||
|
|
||
| {% if planning_item.get('coverages', []) | length is gt 0 %} | ||
| Coverages : | ||
| {% for cov in get_planning_coverages(item, planning_item._id) %} | ||
| Type of coverage : {{ get_coverage_content_type(cov, recipient_language) }} | ||
| Coverage status : {{ get_coverage_status(cov) }} | ||
| Coverage due date & time : {{ get_coverage_date(cov) }} | ||
| Assigned to : | ||
| {% if cov.get('assigned_desk_name') %}{{ cov['assigned_desk_name'] }}{% endif %} | ||
| {% if cov.get('assigned_desk_email') %}{{ cov['assigned_desk_email'] }}{% endif %} | ||
| {% if cov.get('assigned_user_name') %}{{ cov['assigned_user_name'] }}{% endif %} | ||
| {% if cov.get('assigned_user_email') %}{{ cov['assigned_user_email'] }}{% endif %} | ||
| {% endfor %} | ||
| {% endif %} | ||
| {% endfor %} | ||
| Saved topic: {{ topic_name }} | ||
|
|
||
| Saved topic : {{ topic_name }} |