From d68b398910cd5b079d5fcb0f3b93a2610e3d47a8 Mon Sep 17 00:00:00 2001 From: Olle Haerstedt Date: Fri, 23 Sep 2016 12:42:54 +0200 Subject: [PATCH] Dev: Add participant to survey, massive action (CPDB) --- .../views/admin/participants/attributeMap_view.php | 2 +- .../admin/participants/massive_actions/_selector.php | 2 +- scripts/admin/participantpanel.js | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/application/views/admin/participants/attributeMap_view.php b/application/views/admin/participants/attributeMap_view.php index 13585f7bce6..7fec172fa2e 100644 --- a/application/views/admin/participants/attributeMap_view.php +++ b/application/views/admin/participants/attributeMap_view.php @@ -2,7 +2,7 @@ var redUrl = "createUrl("/admin/participants/sa/displayParticipants"); ?>"; var surveyId = ""; var redirect = ""; - if(redirect=='TRUE') + if(redirect == 'on') { redUrl = "createUrl("/admin/tokens/sa/browse/surveyid/{$survey_id}"); ?>"; } diff --git a/application/views/admin/participants/massive_actions/_selector.php b/application/views/admin/participants/massive_actions/_selector.php index 915cb79b145..5579aaf36aa 100644 --- a/application/views/admin/participants/massive_actions/_selector.php +++ b/application/views/admin/participants/massive_actions/_selector.php @@ -78,7 +78,7 @@ 'grid-reload' => 'no', 'actionType' => 'custom', - 'custom-js' => '(function(itemIds) {})' + 'custom-js' => '(function(itemIds) { LS.CPDB.addParticipantToSurvey(itemIds); })' ) ) )); diff --git a/scripts/admin/participantpanel.js b/scripts/admin/participantpanel.js index 4bbd95ae0ae..074c34d4c84 100644 --- a/scripts/admin/participantpanel.js +++ b/scripts/admin/participantpanel.js @@ -365,14 +365,14 @@ LS.CPDB = (function() { */ addParticipantToSurvey = function(participantIds) { var data = { - modalTarget: 'addParticipantToSurvey', - participantIds: participantIds + modalTarget: 'addToSurvey', + participant_id: participantIds.join(',') }; runBaseModal( openModalParticipantPanel, data, - 'action_save_modal_shareparticipant', - 'shareParticipantActiveForm', + 'action_save_modal_addToSurvey', + 'addToSurveyActiveForm', 'list_central_participants' ); }, @@ -403,7 +403,8 @@ LS.CPDB = (function() { sharePanel: sharePanel, onClickExport: onClickExport, bindButtons: bindButtons, - shareMassiveAction: shareMassiveAction + shareMassiveAction: shareMassiveAction, + addParticipantToSurvey: addParticipantToSurvey }; })();