From 37aac002aeaec553c64e5a319635d06a99a78c2e Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 26 Jan 2023 21:54:13 +0100 Subject: [PATCH] org -> unit change, some new functionality --- Admin/Install/db.json | 10 ++++++++++ Models/SurveyTemplateL11n.php | 16 ++++++++++++++++ Models/SurveyTemplateL11nMapper.php | 2 ++ tests/Controller/ApiControllerTest.php | 2 +- 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/Admin/Install/db.json b/Admin/Install/db.json index a4f2d18..df5d2b0 100755 --- a/Admin/Install/db.json +++ b/Admin/Install/db.json @@ -99,6 +99,16 @@ "type": "TEXT", "null": false }, + "survey_template_l11n_footer": { + "name": "survey_template_l11n_footer", + "type": "TEXT", + "null": false + }, + "survey_template_l11n_footer_plain": { + "name": "survey_template_l11n_footer_plain", + "type": "TEXT", + "null": false + }, "survey_template_l11n_template": { "name": "survey_template_l11n_template", "type": "INT", diff --git a/Models/SurveyTemplateL11n.php b/Models/SurveyTemplateL11n.php index 29b4a42..90df03d 100755 --- a/Models/SurveyTemplateL11n.php +++ b/Models/SurveyTemplateL11n.php @@ -74,6 +74,22 @@ class SurveyTemplateL11n implements \JsonSerializable */ public string $descriptionPlain = ''; + /** + * Description. + * + * @var string + * @since 1.0.0 + */ + public string $footer = ''; + + /** + * Description. + * + * @var string + * @since 1.0.0 + */ + public string $footerPlain = ''; + /** * Constructor. * diff --git a/Models/SurveyTemplateL11nMapper.php b/Models/SurveyTemplateL11nMapper.php index bec62f1..b52372f 100755 --- a/Models/SurveyTemplateL11nMapper.php +++ b/Models/SurveyTemplateL11nMapper.php @@ -37,6 +37,8 @@ final class SurveyTemplateL11nMapper extends DataMapperFactory 'survey_template_l11n_title' => ['name' => 'survey_template_l11n_title', 'type' => 'string', 'internal' => 'title', 'autocomplete' => true], 'survey_template_l11n_description' => ['name' => 'survey_template_l11n_description', 'type' => 'string', 'internal' => 'description'], 'survey_template_l11n_description_plain' => ['name' => 'survey_template_l11n_description_plain', 'type' => 'string', 'internal' => 'descriptionPlain'], + 'survey_template_l11n_footer' => ['name' => 'survey_template_l11n_footer', 'type' => 'string', 'internal' => 'footer'], + 'survey_template_l11n_footer_plain' => ['name' => 'survey_template_l11n_footer_plain', 'type' => 'string', 'internal' => 'footerPlain'], 'survey_template_l11n_template' => ['name' => 'survey_template_l11n_template', 'type' => 'int', 'internal' => 'template'], 'survey_template_l11n_language' => ['name' => 'survey_template_l11n_language', 'type' => 'string', 'internal' => 'language'], ]; diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index ffe3b2a..a6b9d15 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -59,7 +59,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase }; $this->app->dbPool = $GLOBALS['dbpool']; - $this->app->orgId = 1; + $this->app->unitId = 1; $this->app->accountManager = new AccountManager($GLOBALS['session']); $this->app->appSettings = new CoreSettings(); $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');