Dev: Populate ck editor fields must be done with CKEDITOR object

LimeSurvey · Mar 5, 2018 · 9bf9c76 · 9bf9c76
1 parent bd12d87
commit 9bf9c76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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');
                     }