Merge remote-tracking branch 'origin/master' into issue442_toggle_emergency

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue

@@ -17,7 +17,8 @@
                   <a :href="getNotificationUrl(n)">{{ n.title }}</a>
                </span>
             </td>
-            <td>{{ n.sender.text }}</td>
+            <td v-if="n.sender != null">{{ n.sender.text }}</td>
+            <td v-else>{{ $t('automatic_notification')}}</td>
             <td>
                <a class="btn btn-sm btn-show"
                   :href="getEntityUrl(n)">

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js

@@ -53,6 +53,7 @@ const appMessages = {
         },
         emergency: "Urgent",
         confidential: "Confidentiel",
+        automatic_notification: "Notification automatique"
     }
 };
 

src/Bundle/ChillMainBundle/Resources/views/OnTheFly/_insert_vue_onthefly.html.twig

@@ -11,7 +11,6 @@
     * buttonText    string
     * displayBadge  boolean (default: false)  replace button by badge, need to define buttonText for content
     * parent        object  (optional)        pass parent context of the targetEntity (used for course resource comment)
-    * isDead        boolean (default: false)  is the person dead
 
 #}
 <span class="onthefly-container"
@@ -29,10 +28,6 @@
         data-button-text="{{ buttonText|e('html_attr') }}"
     {% endif %}
 
-    {% if isDead is defined and isDead == 1  %}
-        data-is-dead="true"
-    {% endif %}
-
     {% if displayBadge is defined and displayBadge == 1 %}
         data-display-badge="true"
     {% endif %}