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

src/Bundle/ChillActivityBundle/Resources/public/page/edit_activity/index.scss

@@ -0,0 +1,16 @@
+div.chill-dropzone__below-zone {
+    a.btn-delete {
+        display: none;
+    }
+}
+
+// do it in js does not work
+// document.addEventListener('DOMContentLoaded', e => {
+//     const dropzoneBelow = document.querySelectorAll('div.chill-dropzone__below-zone');
+//     dropzoneBelow.forEach(
+//         d => {
+//             const a = d.querySelector('a.btn-delete');
+//             d.removeChild(a);
+//         }
+//     )
+// });

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.locations.js

@@ -110,10 +110,8 @@ export default function prepareLocations(store) {
         console.log('default loation id', window.default_location_id);
         if (window.default_location_id) {
             for (let group of store.state.availableLocations) {
-                console.log(group);
                 let location = group.locations.find((l) => l.id === window.default_location_id);
-                console.log(location);
-                if (location !== undefined) {
+                if (location !== undefined & store.state.activity.location === null) {
                     store.dispatch('updateLocation', location);
                     break;
                 }

src/Bundle/ChillActivityBundle/Resources/views/Activity/editAccompanyingCourse.html.twig

@@ -30,4 +30,5 @@
     {{ parent() }}
     {{ encore_entry_link_tags('mod_async_upload') }}
     {{ encore_entry_link_tags('vue_activity') }}
+    {{ encore_entry_link_tags('page_edit_activity') }}
 {% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/listPerson.html.twig

@@ -46,7 +46,7 @@
 
     {% include 'ChillActivityBundle:Activity:list.html.twig' with {'context': 'person'} %}
 
-    {% if is_granted('CHILL_ACTIVITY_CREATE', person) %}
+    {% if is_granted('CHILL_ACTIVITY_CREATE_PERSON', person) %}
     <ul class="record_actions sticky-form-buttons">
         <li>
             <a href="{{ path('chill_activity_activity_new', {'person_id': person_id, 'accompanying_period_id': accompanying_course_id}) }}"