Fixed issue #9138: Sending multiple invitations, reminders to the sam…

…e token
LimeSurvey · Jul 25, 2014 · e4dd6ff · e4dd6ff
1 parent eaee705
commit e4dd6ff
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/application/views/admin/token/browse.php b/application/views/admin/token/browse.php
@@ -91,11 +91,11 @@
     var sRefreshTitle ='<?php $clang->eT("Reload participant list",'js');?>';
     var noSearchResultsTxt = '<?php $clang->eT("No survey participants matching the search criteria",'js');?>';
     var sFind= '<?php $clang->eT("Filter",'js');?>';
-    var remindurl = "<?php echo Yii::app()->getController()->createUrl("admin/tokens/sa/email/action/remind/surveyid/{$surveyid}/tokenids/|"); ?>";
+    var remindurl = "<?php echo Yii::app()->getController()->createUrl("admin/tokens/sa/email/action/remind/surveyid/{$surveyid}"); ?>";
     var attMapUrl = "<?php echo $this->createUrl("admin/participants/sa/attributeMapToken/sid/");?>";
     var invitemsg = "<?php echo $clang->eT("Send an invitation email to the selected entries (if they have not yet been sent an invitation email)"); ?>"
     var remindmsg = "<?php echo $clang->eT("Send a reminder email to the selected entries (if they have already received the invitation email)"); ?>"
-    var inviteurl = "<?php echo Yii::app()->getController()->createUrl("admin/tokens/sa/email/action/invite/surveyid/{$surveyid}/tokenids/|"); ?>";
+    var inviteurl = "<?php echo Yii::app()->getController()->createUrl("admin/tokens/sa/email/action/invite/surveyid/{$surveyid}"); ?>";
     var sSummary =  '<?php $clang->eT("Summary",'js');?>';
     var showDelButton = <?php echo $showDelButton; ?>;
     var showBounceButton = <?php echo $showBounceButton; ?>;

diff --git a/scripts/admin/tokens.js b/scripts/admin/tokens.js
@@ -332,7 +332,15 @@ $(document).ready(function() {
                 }
                 else
                 {
-                    window.open(inviteurl+$("#displaytokens").getGridParam("selarrrow").join("|"), "_blank")
+                    $.post(inviteurl, {tokenids: $("#displaytokens").getGridParam("selarrrow").join("|")}, function (data) {
+                        var win=window.open('about:blank');
+                        with(win.document)
+                        {
+                            open();
+                            write(data);
+                            close();
+                        }
+                    });                    
                 }
             }
         });
@@ -349,7 +357,15 @@ $(document).ready(function() {
                 }
                 else
                 {
-                    window.open(remindurl+$("#displaytokens").getGridParam("selarrrow").join("|"), "_blank")
+                    $.post(remindurl, {tokenids: $("#displaytokens").getGridParam("selarrrow").join("|")}, function (data) {
+                        var win=window.open('about:blank');
+                        with(win.document)
+                        {
+                            open();
+                            write(data);
+                            close();
+                        }
+                    });                    
                 }
             }
         });