From 9bf9c7644b1346e8d9995eb69f47a650b0be556b Mon Sep 17 00:00:00 2001 From: Olle Haerstedt Date: Mon, 5 Mar 2018 11:37:53 +0100 Subject: [PATCH] Dev: Populate ck editor fields must be done with CKEDITOR object --- application/models/Assessment.php | 3 --- assets/scripts/admin/assessments.js | 8 ++++++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/application/models/Assessment.php b/application/models/Assessment.php index 0a495c4c5b1..969363a1513 100644 --- a/application/models/Assessment.php +++ b/application/models/Assessment.php @@ -163,9 +163,6 @@ public function search() $criteria->compare('message', $this->message, true); $criteria->compare('language', App()->language); - // TODO: Does not work with Postgres. - //$criteria->group = 'id'; - return new CActiveDataProvider($this, array( 'criteria'=>$criteria, )); diff --git a/assets/scripts/admin/assessments.js b/assets/scripts/admin/assessments.js index ba1437e836d..9f0d39fabdc 100644 --- a/assets/scripts/admin/assessments.js +++ b/assets/scripts/admin/assessments.js @@ -45,8 +45,12 @@ var bindAction = function(){ $("#in_survey_common").css({cursor: ""}); $.each(responseData.editData, function(key, value){ var itemToChange = $('#assessmentsform').find('[name='+key+']'); - if(!itemToChange.is('input[type=checkbox]') && !itemToChange.is('input[type=radio]')) { - itemToChange.val(value).trigger('change'); + if(!itemToChange.is('input[type=checkbox]') && !itemToChange.is('input[type=radio]')) { + if (CKEDITOR.instances[key]) { + CKEDITOR.instances[key].setData(value); + } else { + itemToChange.val(value).trigger('change'); + } } else { $('#assessmentsform').find('[name='+key+'][value='+value+']').prop('checked',true).trigger('change'); }