diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index 779c9cff8..4e1761814 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -35,11 +35,6 @@
v-bind:options="socialIssuesOther"
v-model="value"
@select="addIssueInList">
-
-
-
-
-
@@ -57,7 +52,7 @@
new Promise((resolve, reject) => {
this.$store.commit('updateIssuesOther', response.results);
- // ajoute dans la liste les issues déjà associées (si elles ne s'y trouvent pas déjà)
+ /* Add in list the issues already associated (if not yet listed)
+ */
this.socialIssuesSelected.forEach(issue => {
if (this.socialIssuesList.filter(i => i.id === issue.id).length !== 1) {
this.$store.commit('addIssueInList', issue);
}
}, this);
- // enlève du multiselect les issues qui sont dans la liste des checkbox
+ /* Remove from multiselect the issues that are not yet in checkbox list
+ */
this.socialIssuesList.forEach(issue => {
this.$store.commit('removeIssueInOther', issue);
}, this);
- // filtre les issues
+ /* Filter issues
+ */
this.$store.commit('filterList', 'issues');
- // ajoute dans la liste les actions déjà associées (si elles ne s'y trouvent pas déjà)
+ /* Add in list the actions already associated (if not yet listed)
+ */
this.socialActionsSelected.forEach(action => {
this.$store.commit('addActionInList', action);
}, this);
- // filtre les actions
+ /* Filter issues
+ */
this.$store.commit('filterList', 'actions');
-
this.issueIsLoading = false;
resolve();
}));
@@ -154,7 +153,7 @@ export default {
remove it from multiselect, and add socialActions concerned
*/
addIssueInList(value) {
- console.log('addIssueInList', value);
+ //console.log('addIssueInList', value);
this.$store.commit('addIssueInList', value);
this.$store.commit('removeIssueInOther', value);
this.$store.dispatch('addIssueSelected', value);
@@ -163,28 +162,23 @@ export default {
/* Update value for selected issues checkboxes
*/
updateIssuesSelected(issues) {
- console.log('updateIssuesSelected', issues);
+ //console.log('updateIssuesSelected', issues);
this.$store.dispatch('updateIssuesSelected', issues);
this.updateActionsList();
},
/* Update value for selected actions checkboxes
*/
updateActionsSelected(actions) {
- console.log('updateActionsSelected', actions);
+ //console.log('updateActionsSelected', actions);
this.$store.dispatch('updateActionsSelected', actions);
},
- /* Add socialActions concerned: reset actions list, then loop on each issue selected
+ /* Add socialActions concerned: after reset, loop on each issue selected
to get social actions concerned
*/
updateActionsList() {
- console.log('updateActionsList');
-
- this.$store.commit('resetActionsList');
-
- // remettre les ActionsSelected dans ActionsList
-
+ //console.log('updateActionsList');
+ this.resetActionsList();
this.socialIssuesSelected.forEach(item => {
- //console.log('for issue', item.id);
this.actionIsLoading = true;
getSocialActionByIssue(item.id)
@@ -199,7 +193,14 @@ export default {
this.actionIsLoading = false;
resolve();
}));
-
+ }, this);
+ },
+ /* Reset socialActions List: flush list and restore selected actions
+ */
+ resetActionsList() {
+ this.$store.commit('resetActionsList');
+ this.socialActionsSelected.forEach(item => {
+ this.$store.commit('addActionInList', item);
}, this);
}
}