Fixed issue #6640: ReminderSent status is still 'N' after sending rem…

…inder
LimeSurvey · Oct 5, 2012 · aae7df3 · aae7df3
1 parent e49cfc9
commit aae7df3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -440,9 +440,9 @@ function getTokens_json($iSurveyId)
                 if($token['completed'] == 'N' && $token['usesleft'] > 0)
                 {
                     if ($token['sent'] == 'N')
-                        $action .= '<input type="image" style="float: left" src="' . Yii::app()->getConfig('adminimageurl') . 'token_invite.png" name="sendinvitations" id="sendinvitations" title="' . $clang->gT("Send invitation email to this person (if they have not yet been sent an invitation email)") . '" onclick=\'window.open("' . Yii::app()->getController()->createUrl("admin/tokens/email/surveyid/{$iSurveyId}/tokenids/" . $token['tid']) . '", "_blank")\' />';
+                        $action .= '<input type="image" style="float: left" src="' . Yii::app()->getConfig('adminimageurl') . 'token_invite.png" name="sendinvitations" id="sendinvitations" title="' . $clang->gT("Send invitation email to this person (if they have not yet been sent an invitation email)") . '" onclick=\'window.open("' . Yii::app()->getController()->createUrl("admin/tokens/email/surveyid/{$iSurveyId}/tokenids/" . $token['tid']) . '")\' />';
                     else
-                        $action .= '<input type="image" style="float: left" src="' . Yii::app()->getConfig('adminimageurl') . 'token_remind.png" name="sendreminders" id="sendreminders" title="' . $clang->gT("Send reminder email to this person (if they have already received the invitation email)") . '" onclick=\'window.open("' . Yii::app()->getController()->createUrl("admin/tokens/email/action/remind/surveyid/{$iSurveyId}/tokenids/" . $token['tid']) . '", "_blank")\' />';
+                        $action .= '<input type="image" style="float: left" src="' . Yii::app()->getConfig('adminimageurl') . 'token_remind.png" name="sendreminders" id="sendreminders" title="' . $clang->gT("Send reminder email to this person (if they have already received the invitation email)") . '" onclick=\'window.open("' . Yii::app()->getController()->createUrl("admin/tokens/email/action/remind/surveyid/{$iSurveyId}/tokenids/" . $token['tid']) . '")\' />';
                 } else {
                     $action .= '<div style="width: 20px; height: 16px; float: left;"></div>';
                 }

diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php
@@ -78,7 +78,6 @@ public function rules()
 	{
 		return array(
 		array('remindercount','numerical', 'integerOnly'=>true,'allowEmpty'=>true), 
-		array('remindersent' ,'in','range'=>array('Y','N'), 'allowEmpty'=>true), 
 		array('usesleft','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
 		array('mpid','numerical', 'integerOnly'=>true,'allowEmpty'=>true), 	
 		array('blacklisted', 'in','range'=>array('Y','N'), 'allowEmpty'=>true),