Merge pull request #89 from QoboLtd/task-12216

Drop cakephp-utils (task #12216)
QoboLtd · Mar 10, 2020 · da47711 · da47711
2 parents 0dbd54a + fb9daf8
commit da47711
Show file tree

Hide file tree

Showing 90 changed files with 1,674 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -28,8 +28,11 @@
         }
     ],
     "require": {
-        "qobo/cakephp-utils": "^13.0",
-        "muffin/slug": "^1.2"
+        "admad/cakephp-sequence": "^2.2",
+        "cakephp/cakephp": "^3.5 <3.7",
+        "muffin/slug": "^1.2",
+        "muffin/trash": "^2.1",
+        "riesenia/cakephp-duplicatable": "^3.0"
     },
     "require-dev": {
         "qobo/cakephp-composer-dev": "^v1.0"

diff --git a/src/Controller/SurveysController.php b/src/Controller/SurveysController.php
@@ -120,7 +120,7 @@ public function view(string $id)
             ->order(['submit_date' => 'DESC']);
         $entries = $query->all();
 
-        $this->set(compact('survey', 'questionTypes', 'submits', 'entries'));
+        $this->set(compact('survey', 'questionTypes', 'entries'));
     }
 
     /**

diff --git a/src/Template/Element/tinymce.ctp b/src/Template/Element/tinymce.ctp
@@ -13,7 +13,7 @@
 use Cake\Core\Configure;
 
 // load tinyMCE editor and elFinder file manager
-echo $this->Html->script('Qobo/Utils./plugins/tinymce/tinymce.min', ['block' => 'scriptBottom']);
+echo $this->Html->script('Qobo/Survey./plugins/tinymce/tinymce.min', ['block' => 'scriptBottom']);
 
 // initialize tinyMCE
 echo $this->Html->scriptBlock(

diff --git a/webroot/plugins/tinymce/changelog.txt b/webroot/plugins/tinymce/changelog.txt
diff --git a/webroot/plugins/tinymce/jquery.tinymce.min.js b/webroot/plugins/tinymce/jquery.tinymce.min.js
diff --git a/webroot/plugins/tinymce/langs/readme.md b/webroot/plugins/tinymce/langs/readme.md
@@ -0,0 +1,3 @@
+This is where language files should be placed.
+
+Please DO NOT translate these directly use this service: https://www.transifex.com/projects/p/tinymce/