diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php index bc2eeebcc49..eed48d77b4f 100644 --- 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 .= 'getController()->createUrl("admin/tokens/email/surveyid/{$iSurveyId}/tokenids/" . $token['tid']) . '", "_blank")\' />'; + $action .= 'getController()->createUrl("admin/tokens/email/surveyid/{$iSurveyId}/tokenids/" . $token['tid']) . '")\' />'; else - $action .= 'getController()->createUrl("admin/tokens/email/action/remind/surveyid/{$iSurveyId}/tokenids/" . $token['tid']) . '", "_blank")\' />'; + $action .= 'getController()->createUrl("admin/tokens/email/action/remind/surveyid/{$iSurveyId}/tokenids/" . $token['tid']) . '")\' />'; } else { $action .= '
'; } diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php index 8923d0f977b..4eea1b7b46b 100644 --- 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),