From 3e95f68cb17e82d0ed8200d10ced99c522e6f9cc Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Tue, 21 Aug 2012 11:56:54 +0200 Subject: [PATCH] Fixed issue #6503: Update of "Invitation sent" is broken --- application/controllers/admin/surveyadmin.php | 2 +- application/models/Tokens_dynamic.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php index b1b64c3d7dc..b983d032b65 100644 --- a/application/controllers/admin/surveyadmin.php +++ b/application/controllers/admin/surveyadmin.php @@ -667,7 +667,7 @@ public function getSurveys_json() $aSurveyEntry['viewurl'] = $this->getController()->createUrl("/admin/survey/view/surveyid/" . $rows['sid']); - if (Yii::app()->db->schema->getTable("{{tokens_" . $rows['sid'] . "}}")) + if (tableExists('tokens_' . $rows['sid'] )) { $tokens = Tokens_dynamic::model($rows['sid'])->count(); $tokenscompleted = Tokens_dynamic::model($rows['sid'])->count(array( diff --git a/application/models/Tokens_dynamic.php b/application/models/Tokens_dynamic.php index 2942769509e..0a4949192f8 100644 --- a/application/models/Tokens_dynamic.php +++ b/application/models/Tokens_dynamic.php @@ -82,13 +82,12 @@ public function rules() array('usesleft','numerical', 'integerOnly'=>true,'allowEmpty'=>true), array('mpid','numerical', 'integerOnly'=>true,'allowEmpty'=>true), array('blacklisted', 'in','range'=>array('Y','N'), 'allowEmpty'=>true), - array('sent', 'in','range'=>array('Y','N'), 'allowEmpty'=>true), - array('completed', 'in','range'=>array('Y','N'), 'allowEmpty'=>true), array('validfrom','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true), array('validuntil','date', 'format'=>array('yyyy-MM-dd', 'yyyy-MM-dd HH:mm', 'yyyy-MM-dd HH:mm:ss',), 'allowEmpty'=>true), ); } - + + /** * Returns summary information of this token table *