Dev Unified model names

LimeSurvey · Apr 5, 2013 · f3058da · f3058da
1 parent eaef9ba
commit f3058da
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/application/controllers/admin/participantsaction.php b/application/controllers/admin/participantsaction.php
@@ -850,7 +850,6 @@ function getAttribute_json()
     {
         $iParticipantId = Yii::app()->request->getQuery('pid');
         $records = ParticipantAttributeName::model()->getParticipantVisibleAttribute($iParticipantId);
-        //$getallattributes = ParticipantAttributeName::model()->with('participant_attribute_names_lang')->findAll();
         $records = subval_sort($records, "attribute_name", "asc");
 
         $i = 0;

diff --git a/application/models/Condition.php b/application/models/Condition.php
@@ -62,7 +62,7 @@ public function primaryKey()
         public function relations()
         {
             return array(
-            'questions' => array(self::HAS_ONE, 'Questions', '',
+            'questions' => array(self::HAS_ONE, 'Question', '',
             'on' => 't.cqid = questions.qid',
             ),
             );

diff --git a/application/models/DefaultValue.php b/application/models/DefaultValue.php
@@ -59,7 +59,7 @@ public function primaryKey()
 	public function relations()
 	{
 		return array(
-			'question' => array(self::HAS_ONE, 'Questions', '',
+			'question' => array(self::HAS_ONE, 'Question', '',
 						'on' => 't.qid = question.qid',
 			),
 		);