Dev: Rename 'all' to 'filtered' (CPDB)

LimeSurvey · Dec 1, 2016 · e3096d1 · e3096d1
1 parent 60f81fb
commit e3096d1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
@@ -377,13 +377,12 @@ public function deleteParticipant()
         $participantId = Yii::app()->request->getPost('participant_id');
 
         // Massive action can be either delete all in current filter or only checked rows
-        $allOrSelected = Yii::app()->request->getPost('allOrSelected');
-        Yii::log(print_r($allOrSelected, true), CLogger::LEVEL_TRACE, 'debug');
+        $filteredOrSelected = Yii::app()->request->getPost('filteredOrSelected');
 
         // No single delete? Check filter or selected checkboxes
         if (empty($participantId)) {
 
-            if ($allOrSelected == 'all') {
+            if ($filteredOrSelected == 'filtered') {
                 $p = new Participant();
                 $p->setAttributes(Yii::app()->request->getPost('Participant'));
                 $dataProvider = $p->search();
@@ -1086,6 +1085,8 @@ public function exporttocsv()
     {
         $this->checkPermission('export');
 
+        $filteredOrSelected = Yii::app()->request->getPost('filteredOrSelected');
+
         if (Yii::app()->request->getPost('searchcondition','') !== '') // if there is a search condition then only the participants that match the search criteria are counted
         {
             $condition = explode("%7C%7C", Yii::app()->request->getPost('searchcondition',''));

diff --git a/application/views/admin/participants/massive_actions/_selector.php b/application/views/admin/participants/massive_actions/_selector.php
@@ -2,7 +2,7 @@
 <div class="col-sm-4 pull-left dropup listActions">
     <!-- Drop Up button selector -->
     <button class='btn btn-default dropdown-toggle' id='massive-action-dropdown-selector' type='button' data-toggle='dropdown' aria-haspopup='true' aria-expanded='true'>
-    <span id='massive-action-dropdown-selector-text'><?php eT('All participant(s)'); ?></span>
+    <span id='massive-action-dropdown-selector-text'><?php eT('Filtered participant(s)'); ?></span>
         <span class='caret'></span>
     </button>
 
@@ -14,7 +14,7 @@
 
         <!-- Delete -->
         <li>
-            <a href='#' data-toggle='modal' data-target='#myModal'>
+            <a href='#' data-toggle='modal' data-target='#delete-option-modal'>
                 <span class='text-danger glyphicon glyphicon-trash'></span>
                 <?php eT('Delete'); ?>
             </a>
@@ -23,7 +23,7 @@
         <li role='separator' class='divider'></li>
 
         <li>
-            <a href='#'>
+            <a href='#' onclick='LS.CPDB.onClickExport();'>
                 <span class='icon-exportcsv'></span>
                 <?php eT('Export'); ?>
             </a>
@@ -44,7 +44,7 @@
 </div>
 
 <!-- Modal for delete -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+<div class="modal fade" id="delete-option-modal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">

diff --git a/application/views/admin/participants/participantsPanel_view.php b/application/views/admin/participants/participantsPanel_view.php
@@ -13,7 +13,7 @@
     var exportToCSVURL = "<?php echo Yii::app()->getController()->createUrl("admin/participants/sa/exporttocsv"); ?>";
     var openModalParticipantPanel = "<?php echo ls\ajax\AjaxHelper::createUrl("/admin/participants/sa/openModalParticipantPanel"); ?>";
     var editValueParticipantPanel = "<?php echo Yii::app()->getController()->createUrl("/admin/participants/sa/editValueParticipantPanel"); ?>";
-    var sAllParticipantsText = '<?php eT('All participant(s)...', 'js'); ?>';
+    var sFilteredParticipantsText = '<?php eT('Filtered participant(s)...', 'js'); ?>';
     var sSelectedParticipantsText = '<?php eT('Selected participant(s)...', 'js'); ?>';
 
     var translate_blacklisted = "<?php echo '<i class=\"fa fa-undo\"></i> '.gT('Remove from blacklist?'); ?>";

diff --git a/scripts/admin/participantpanel.js b/scripts/admin/participantpanel.js
@@ -3,14 +3,14 @@ LS = LS || {};
 LS.CPDB = (function() {
 
     /**
-     * Returns 'all' if no participant is selected, otherwise 'selected'
+     * Returns 'filtered' if no participant is selected, otherwise 'selected'
      * @private
      * @return string
      */
-    function getAllOrSelected() {
+    function getFilteredOrSelected() {
         var nrOfChecked = $('.selector_participantCheckbox:checked, #action_toggleAllParticipant:checked').length;
         if (nrOfChecked == 0) {
-            return 'all';
+            return 'filtered';
         }
         else {
             return 'selected';
@@ -77,7 +77,7 @@ LS.CPDB = (function() {
     /**
      * Run when user clicks 'Export'
      * Used for both all participants and checked participants
-     * @param {boolean} all - If true, export all participants
+     * @param {boolean} all - If true, export all participants, no matter filter
      * @return
      */
     onClickExport = function(all) {
@@ -92,6 +92,8 @@ LS.CPDB = (function() {
             });
         }
 
+        postdata['filteredOrSelected'] = getFilteredOrSelected();
+
         $.ajax({
             url: exporttocsvcountall,
             data: postdata,
@@ -312,9 +314,8 @@ LS.CPDB = (function() {
         // Change massive action text depending on check boxes
         $('.selector_participantCheckbox, #action_toggleAllParticipant').on('click', function() {
 
-            var nrOfChecked = $('.selector_participantCheckbox:checked, #action_toggleAllParticipant:checked').length;
-            if (nrOfChecked == 0) {
-                $('#massive-action-dropdown-selector-text').html(sAllParticipantsText);
+            if (getFilteredOrSelected() == 'filtered') {
+                $('#massive-action-dropdown-selector-text').html(sFilteredParticipantsText);
             }
             else {
                 $('#massive-action-dropdown-selector-text').html(sSelectedParticipantsText);
@@ -463,9 +464,9 @@ LS.CPDB = (function() {
         var selectedOption = $('#delete-participant-select-option').val();
         data['selectedoption'] = selectedOption;
 
-        data['allOrSelected'] = getAllOrSelected();
+        data['filteredOrSelected'] = getFilteredOrSelected();
 
-        if (getAllOrSelected() == 'all') {
+        if (getFilteredOrSelected() == 'filtered') {
             // Fetch all filters, used by CDataProvider
             var inputs = $('#list_central_participants .filters input, #list_central_participants .filters select');
             for (var i = 0; i < inputs.length; i++) {
@@ -480,8 +481,6 @@ LS.CPDB = (function() {
             }
         }
 
-        console.log(data);
-
         LS.ajax({
             url: url,
             data: data,