Skip to content

Commit

Permalink
Fixed issue: Numerous postgres problems due to improper table alias n…
Browse files Browse the repository at this point in the history 
…ame casing
  • Loading branch information
@c-schmitz
c-schmitz committed Mar 23, 2020
1 parent 44a27b8 commit 2c60503
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 32 deletions.
10 changes: 5 additions & 5 deletions application/controllers/admin/database.php
View file
Expand Up @@ -191,8 +191,8 @@ public function _updateDefaultValues($qid, $sqid, $scale_id, $specialtype, $lang
}
} else {
if ($dvid !== null){
$arDefaultValue->with('defaultValueL10ns');
$idL10n = !empty($arDefaultValue->defaultValueL10ns) && array_key_exists($language, $arDefaultValue->defaultValueL10ns) ? $arDefaultValue->defaultValueL10ns[$language]->id : null;
$arDefaultValue->with('defaultvaluel10ns');
$idL10n = !empty($arDefaultValue->defaultvaluel10ns) && array_key_exists($language, $arDefaultValue->defaultvaluel10ns) ? $arDefaultValue->defaultvaluel10ns[$language]->id : null;
if ($idL10n !== null){
DefaultValueL10n::model()->updateAll(array('defaultvalue'=>$defaultvalue), 'dvid = ' . $dvid . ' AND language = \'' . $language . '\'');
} else {
Expand Down Expand Up @@ -1401,7 +1401,7 @@ private function actionInsertCopyQuestion($iSurveyID)
}
}
if (returnGlobal('copydefaultanswers') == 1) {
$oOldDefaultValues = DefaultValue::model()->with('defaultValueL10ns')->findAll("qid=:qid", array("qid"=>returnGlobal('oldqid')));
$oOldDefaultValues = DefaultValue::model()->with('defaultvaluel10ns')->findAll("qid=:qid", array("qid"=>returnGlobal('oldqid')));
foreach ($oOldDefaultValues as $defaultvalue) {
$newDefaultValue = new DefaultValue();
$newDefaultValue->qid = $this->iQuestionID;
Expand All @@ -1410,8 +1410,8 @@ private function actionInsertCopyQuestion($iSurveyID)
$newDefaultValue->specialtype = $defaultvalue['specialtype'];
if ($newDefaultValue->save()) {
$iNewDefaultValueId = Yii::app()->db->getLastInsertID();
if (isset($defaultvalue->defaultValueL10ns)){
foreach($defaultvalue->defaultValueL10ns as $language => $defaultValueL10ns){
if (isset($defaultvalue->defaultvaluel10ns)){
foreach($defaultvalue->defaultvaluel10ns as $language => $defaultValueL10ns){
$oDefaultValueLS = new DefaultValueL10n;
$oDefaultValueLS->dvid = $iNewDefaultValueId;
$oDefaultValueLS->language = $language;
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/labels.php
View file
Expand Up @@ -508,7 +508,7 @@ function ($sLanguage) use (&$aLanguageArray, $aAllLanguages) {
array_walk(
$aLabels,
function ($oLabel) use (&$aLabelCompleteArray) {
$aLabelCompleteArray[] = array_merge($oLabel->attributes, $oLabel->labelL10ns);
$aLabelCompleteArray[] = array_merge($oLabel->attributes, $oLabel->labell10ns);
}
);

Expand Down Expand Up @@ -624,7 +624,7 @@ function ($lng) use (&$oCriteria) {
$aLabelSet = $oLabelSet->attributes;
$aLabelSet['labels'] = array_map(
function ($oLabel) {
return array_merge($oLabel->attributes, $oLabel->labelL10ns);
return array_merge($oLabel->attributes, $oLabel->labell10ns);
},
$oLabelSet->labels
);
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/questionedit.php
View file
Expand Up @@ -1047,7 +1047,7 @@ private function copyDefaultAnswers($oQuestion, $oldQid)
return false;
}

$oOldDefaultValues = DefaultValue::model()->with('defaultValueL10ns')->findAllByAttributes(['qid' => $oldQid]);
$oOldDefaultValues = DefaultValue::model()->with('defaultvaluel10ns')->findAllByAttributes(['qid' => $oldQid]);

$setApplied['defaultValues'] = array_reduce(
$oOldDefaultValues,
Expand All @@ -1065,7 +1065,7 @@ function ($collector, $oDefaultValue) use ($oQuestion) {
);
}

foreach ($oDefaultValue->defaultValueL10ns as $oDefaultValueL10n) {
foreach ($oDefaultValue->defaultvaluel10ns as $oDefaultValueL10n) {
$oNewDefaultValueL10n = new DefaultValueL10n();
$oNewDefaultValueL10n->setAttributes($oDefaultValueL10n->attributes, false);
$oNewDefaultValueL10n->id = null;
Expand Down
24 changes: 12 additions & 12 deletions application/controllers/admin/questions.php
View file
Expand Up @@ -320,17 +320,17 @@ public function editdefaultvalues($surveyid, $gid, $qid)
$langopts[$language][$questionrow['type']][$scale_id] = array();

$defaultvalue = DefaultValue::model()
->with('defaultValueL10ns')
->with('defaultvaluel10ns')
->find(
'specialtype = :specialtype AND qid = :qid AND scale_id = :scale_id AND defaultValueL10ns.language =:language',
'specialtype = :specialtype AND qid = :qid AND scale_id = :scale_id AND defaultvaluel10ns.language =:language',
array(
':specialtype' => '',
':qid' => $qid,
':scale_id' => $scale_id,
':language' => $language,
)
);
$defaultvalue = !empty($defaultvalue->defaultValueL10ns) && array_key_exists($language, $defaultvalue->defaultValueL10ns) ? $defaultvalue->defaultValueL10ns[$language]->defaultvalue : null;
$defaultvalue = !empty($defaultvalue->defaultvaluel10ns) && array_key_exists($language, $defaultvalue->defaultvaluel10ns) ? $defaultvalue->defaultvaluel10ns[$language]->defaultvalue : null;
$langopts[$language][$questionrow['type']][$scale_id]['defaultvalue'] = $defaultvalue;

$answerresult = Answer::model()->with('answerl10ns')->findAll(
Expand All @@ -345,17 +345,17 @@ public function editdefaultvalues($surveyid, $gid, $qid)

if ($questionrow['other'] == 'Y') {
$defaultvalue = DefaultValue::model()
->with('defaultValueL10ns')
->with('defaultvaluel10ns')
->find(
'specialtype = :specialtype AND qid = :qid AND scale_id = :scale_id AND defaultValueL10ns.language =:language',
'specialtype = :specialtype AND qid = :qid AND scale_id = :scale_id AND defaultvaluel10ns.language =:language',
array(
':specialtype' => 'other',
':qid' => $qid,
':scale_id' => $scale_id,
':language' => $language,
)
);
$defaultvalue = !empty($defaultvalue->defaultValueL10ns) && array_key_exists($language, $defaultvalue->defaultValueL10ns) ? $defaultvalue->defaultValueL10ns[$language]->defaultvalue : null;
$defaultvalue = !empty($defaultvalue->defaultvaluel10ns) && array_key_exists($language, $defaultvalue->defaultvaluel10ns) ? $defaultvalue->defaultvaluel10ns[$language]->defaultvalue : null;
$langopts[$language][$questionrow['type']]['Ydefaultvalue'] = $defaultvalue;
}
}
Expand Down Expand Up @@ -392,9 +392,9 @@ public function editdefaultvalues($surveyid, $gid, $qid)

foreach ($sqresult as $aSubquestion) {
$defaultvalue = DefaultValue::model()
->with('defaultValueL10ns')
->with('defaultvaluel10ns')
->find(
'specialtype = :specialtype AND qid = :qid AND sqid = :sqid AND scale_id = :scale_id AND defaultValueL10ns.language =:language',
'specialtype = :specialtype AND qid = :qid AND sqid = :sqid AND scale_id = :scale_id AND defaultvaluel10ns.language =:language',
array(
':specialtype' => '',
':qid' => $qid,
Expand All @@ -403,7 +403,7 @@ public function editdefaultvalues($surveyid, $gid, $qid)
':language' => $language
)
);
$defaultvalue = !empty($defaultvalue->defaultValueL10ns) && array_key_exists($language, $defaultvalue->defaultValueL10ns) ? $defaultvalue->defaultValueL10ns[$language]->defaultvalue : null;
$defaultvalue = !empty($defaultvalue->defaultvaluel10ns) && array_key_exists($language, $defaultvalue->defaultvaluel10ns) ? $defaultvalue->defaultvaluel10ns[$language]->defaultvalue : null;

$question = $aSubquestion->questionl10ns[$language]->question;
$aSubquestion = $aSubquestion->attributes;
Expand All @@ -418,17 +418,17 @@ public function editdefaultvalues($surveyid, $gid, $qid)
if ($qtproperties[$questionrow['type']]['answerscales'] == 0 &&
$qtproperties[$questionrow['type']]['subquestions'] == 0) {
$defaultvalue = DefaultValue::model()
->with('defaultValueL10ns')
->with('defaultvaluel10ns')
->find(
'specialtype = :specialtype AND qid = :qid AND scale_id = :scale_id AND defaultValueL10ns.language =:language',
'specialtype = :specialtype AND qid = :qid AND scale_id = :scale_id AND defaultvaluel10ns.language =:language',
array(
':specialtype' => '',
':qid' => $qid,
':scale_id' => 0,
':language' => $language,
)
);
$langopts[$language][$questionrow['type']][0] = !empty($defaultvalue->defaultValueL10ns) && array_key_exists($language, $defaultvalue->defaultValueL10ns) ? $defaultvalue->defaultValueL10ns[$language]->defaultvalue : null;
$langopts[$language][$questionrow['type']][0] = !empty($defaultvalue->defaultvaluel10ns) && array_key_exists($language, $defaultvalue->defaultvaluel10ns) ? $defaultvalue->defaultvaluel10ns[$language]->defaultvalue : null;
}

}
Expand Down
6 changes: 3 additions & 3 deletions application/helpers/admin/label_helper.php
View file
Expand Up @@ -66,14 +66,14 @@ function updateset($lid)
$criteria->addColumnCondition(array('lid' => $lid));
$langcriteria = new CDbCriteria();
foreach ($dellangidsarray as $sDeleteLanguage) {
$langcriteria->addColumnCondition(array('labelL10ns.language' => $sDeleteLanguage), 'OR');
$langcriteria->addColumnCondition(array('labell10ns.language' => $sDeleteLanguage), 'OR');
}
$criteria->mergeWith($langcriteria);
// FIXME undefined function
//debugbreak();
$aLabels = Label::model()->with('labelL10ns')->together()->findAll($criteria);
$aLabels = Label::model()->with('labell10ns')->together()->findAll($criteria);
foreach ($aLabels as $aLabel) {
foreach ($aLabel->labelL10ns as $aLabelL10ns) {
foreach ($aLabel->labell10ns as $aLabelL10ns) {
$aLabelL10ns->delete();
}
}
Expand Down
4 changes: 2 additions & 2 deletions application/helpers/remotecontrol/remotecontrol_handle.php
View file
Expand Up @@ -1647,9 +1647,9 @@ public function get_question_properties($sSessionKey, $iQuestionID, $aQuestionSe
$aResult['answeroptions'] = 'No available answer options';
}
} else if ($sPropertyName == 'defaultvalue') {
$aResult['defaultvalue'] = DefaultValue::model()->with('defaultValueL10ns')
$aResult['defaultvalue'] = DefaultValue::model()->with('defaultvaluel10ns')
->find(
'qid = :qid AND defaultValueL10ns.language = :language',
'qid = :qid AND defaultvaluel10ns.language = :language',
array(':qid' => $iQuestionID, ':language'=> $sLanguage)
)
->defaultvalue;
Expand Down
6 changes: 3 additions & 3 deletions application/models/DefaultValue.php
View file
Expand Up @@ -62,7 +62,7 @@ public function relations()
$alias = $this->getTableAlias();
return array(
'question' => array(self::HAS_ONE, 'Question', "qid"),
'defaultValueL10ns' => array(self::HAS_MANY, 'DefaultValueL10n', 'dvid')
'defaultvaluel10ns' => array(self::HAS_MANY, 'DefaultValueL10n', 'dvid')
);
}

Expand Down Expand Up @@ -95,7 +95,7 @@ public function insertRecords($data)
/*
public function getDefaultValue($language = 'en')
{
$oDefaultValue = $this->with('defaultValueL10ns')->find('language = :language', array(':language' => $language));
return $oDefaultValue->defaultValueL10ns[$language]->defaultvalue;
$oDefaultValue = $this->with('defaultvaluel10ns')->find('language = :language', array(':language' => $language));
return $oDefaultValue->defaultvaluel10ns[$language]->defaultvalue;
}*/
}
4 changes: 2 additions & 2 deletions application/models/Label.php
View file
Expand Up @@ -78,12 +78,12 @@ public function relations()
// class name for the relations automatically generated below.
return array(
'labelset' => array(self::BELONGS_TO, 'LabelSet', 'lid'),
'labelL10ns' => array(self::HAS_MANY, 'LabelL10n', 'label_id')
'labell10ns' => array(self::HAS_MANY, 'LabelL10n', 'label_id')
);
}

public function getTranslated($sLanguage) {
$ol10N = $this->labelL10ns;
$ol10N = $this->labell10ns;
if(isset($ol10N[$sLanguage])) {
return array_merge($this->attributes, $ol10N[$sLanguage]->attributes);
}
Expand Down
2 changes: 1 addition & 1 deletion application/views/admin/labels/_labelviewtabcontent_view.php
View file
Expand Up @@ -54,7 +54,7 @@
<td>
<div class="input-group">
<input type='text' class=" form-control " name='title_<?php echo $lslanguage; ?>_<?php echo $row['sortorder'] ?>' maxlength='3000' size='80' value="<?php
echo HTMLEscape($row->labelL10ns[$lslanguage]->title) ?>" />
echo HTMLEscape($row->labell10ns[$lslanguage]->title) ?>" />
<span class="input-group-addon">
<?php echo getEditor("editlabel", "title_{$lslanguage}_{$row['sortorder']}", "[" . gT("Label:", "js") . "](" . $lslanguage . ")", '', '', '', $action); ?>
</span>
Expand Down

0 comments on commit 2c60503

Please sign in to comment.