Revert "Fixed issue #08461: Unable to filter by Email Status inside T…

…oken view" This reverts commit 17b8dd6.
LimeSurvey · Dec 18, 2013 · bb9f28e · bb9f28e
1 parent 17b8dd6
commit bb9f28e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -477,8 +477,7 @@ function getTokens_json($iSurveyId, $search = null)
             }
             $aData->rows[] = $aRowToAdd;
         }
-        viewHelper::disableHtmlLogging();
-        header("Content-type: application/json");
+
         echo ls_json_encode($aData);
     }
 
@@ -488,6 +487,7 @@ function getSearch_json($iSurveyId)
         $searchcondition = urldecode($searchcondition);
         $finalcondition = array();
         $condition = explode("||", $searchcondition);
+
         return $this->getTokens_json($iSurveyId, $condition);
     }
 
@@ -589,8 +589,9 @@ function editToken($iSurveyId)
                     $this->getController()->error(sprintf($clang->gT('%s cannot be left empty'), $desc['description']));
                 $aData[$attr_name] = Yii::app()->request->getPost($attr_name);
             }
+            echo ls_json_encode(var_export($aData));
             $token = Token::create($surveyId);
-            $token->setAttributes($aData, false);
+			$token->setAttributes($aData, false);
             echo $token->save();
         }
         elseif ($sOperation == 'del' && Permission::model()->hasSurveyPermission($iSurveyId, 'tokens', 'update'))

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -5464,11 +5464,6 @@ function getTokenFieldsAndNames($surveyid, $bOnlyAttributes = false)
             'mandatory'=>'N',
             'showregister'=>'Y'
         ),
-        'emailstatus'=>array(
-            'description'=>$clang->gT("Email status"),
-            'mandatory'=>'N',
-            'showregister'=>'N'
-        ),
         'token'=>array(
             'description'=>$clang->gT('Token'),
             'mandatory'=>'N',

diff --git a/application/views/admin/token/browse.php b/application/views/admin/token/browse.php
@@ -20,7 +20,6 @@
     // Don't add id : because we don't really need it. This different from columnNames (no action).
     // TODO: Merge columnNames and aTokenColumns : need more option (name,index,search, type, editable ...)
     $aTokenColumns=getTokenFieldsAndNames($surveyid,false);
-    tracevar($aTokenColumns);
     $aNotQuickFilter=array('tid','emailstatus','sent','remindersent','remindercount','completed','usesleft','validfrom','validuntil');
     foreach($aTokenColumns as $aTokenColumn => &$aTokenInformation)
     {
@@ -157,15 +156,15 @@
 
 <div id ="search" style="display:none">
     <?php
-        $aOptionSearch = array('' => $clang->gT('Select...'));
+        $optionsearch = array('' => $clang->gT('Select...'));
         foreach($aTokenColumns as $aTokenColumn => $aTokenInformation)
         {
             if($aTokenInformation['search'])
             {
-                $aOptionSearch[$aTokenColumn]=$aTokenInformation['description'];
+                $optionsearch[$aTokenColumn]=$aTokenInformation['description'];
             }
         }
-        $aOptionCondition = array('' => $clang->gT('Select...'),
+        $optioncontition = array('' => $clang->gT('Select...'),
         'equal' => $clang->gT("Equals"),
         'contains' => $clang->gT("Contains"),
         'notequal' => $clang->gT("Not equal"),
@@ -175,8 +174,8 @@
     ?>
     <table id='searchtable'>
         <tr>
-            <td><?php echo CHtml::dropDownList('field_1', 'id="field_1"', $aOptionSearch); ?></td>
-            <td><?php echo CHtml::dropDownList('condition_1', 'id="condition_1"', $aOptionCondition); ?></td>
+            <td><?php echo CHtml::dropDownList('field_1', 'id="field_1"', $optionsearch); ?></td>
+            <td><?php echo CHtml::dropDownList('condition_1', 'id="condition_1"', $optioncontition); ?></td>
             <td><input type="text" id="conditiontext_1" style="margin-left:10px;" /></td>
             <td><img src=<?php echo Yii::app()->getConfig('adminimageurl')."plus.png" ?> alt='<?php $clang->eT("Add another search criteria");?>' class="addcondition-button" style="margin-bottom:4px"></td>
         </tr>