diff --git a/docs/book/installation.md b/docs/book/installation.md index f12e396..014f09a 100644 --- a/docs/book/installation.md +++ b/docs/book/installation.md @@ -72,6 +72,17 @@ Add them to ./public/vendor | +-- filepond-plugin-image-preview.js ``` +* [Summernote 0.8.15](https://github.com/summernote/summernote/releases) +> Texteditor +``` +. ++-- summernote +| +-- summernote-bs4.min.js +| +-- summernote-bs4.min.css +| +-- lang +| +-- font +``` + * [Select2 4.0.x](https://github.com/select2/select2/releases) > For all Select und Multiselect Fields ``` diff --git a/module/Application/src/Controller/CoreController.php b/module/Application/src/Controller/CoreController.php index 1cd2eef..a6f973b 100644 --- a/module/Application/src/Controller/CoreController.php +++ b/module/Application/src/Controller/CoreController.php @@ -483,13 +483,12 @@ protected function parseFormData(array $aRawData) { foreach($aRawData[$sKey] as $iData) { # If not numberic - its a new dataset if(!is_numeric($iData)) { - # check if table connection already exists - if(!array_key_exists($oField->tbl_cached_name,CoreController::$aCoreTables)) { - CoreController::$aCoreTables[$oField->tbl_cached_name] = CoreController::$oServiceManager->get($oField->tbl_class); - } + $oTblEntity = CoreController::$oServiceManager->get($oField->tbl_class); # check if addMinimal exists on TableModel - if(method_exists(CoreController::$aCoreTables[$oField->tbl_cached_name],'addMinimal')) { - $iNewEntryID = CoreController::$aCoreTables[$oField->tbl_cached_name]->addMinimal($iData,$this->sSingleForm,$oField->fieldkey); + if(method_exists($oTblEntity,'addMinimal')) { + echo 'tbl:'.$oField->tbl_cached_name; + $iNewEntryID = $oTblEntity->addMinimal($iData,$this->sSingleForm,$oField->fieldkey); + echo 'id:'.$iNewEntryID.'#'; # Save New Entry $aNewData[] = $iNewEntryID; } diff --git a/module/Application/view/layout/layout-default.phtml b/module/Application/view/layout/layout-default.phtml index 2112fb5..2683187 100644 --- a/module/Application/view/layout/layout-default.phtml +++ b/module/Application/view/layout/layout-default.phtml @@ -17,6 +17,7 @@ use Application\Controller\CoreController; = $this->headLink(['rel' => 'shortcut icon', 'type' => 'image/vnd.microsoft.icon', 'href' => $this->basePath() . '/img/favicon.ico']) ->prependStylesheet($this->basePath('css/style.css')) + ->prependStylesheet($this->basePath('vendor/summernote/summernote-bs4.min.css')) ->prependStylesheet($this->basePath('vendor/fontawesome/css/all.min.css')) ->prependStylesheet($this->basePath('vendor/filepond/filepond.css')) ->prependStylesheet($this->basePath('vendor/apexcharts/css/apexcharts.css')) @@ -31,6 +32,7 @@ use Application\Controller\CoreController; = $this->inlineScript() ->prependFile($this->basePath('js/plc-message.js')) ->prependFile($this->basePath('js/listener.js')) + ->prependFile($this->basePath('vendor/summernote/summernote-bs4.min.js')) ->prependFile($this->basePath('vendor/apexcharts/apexcharts.min.js')) ->prependFile($this->basePath('vendor/jquery-ui/jquery-ui.min.js')) ->prependFile($this->basePath('vendor/select2/js/select2.full.min.js')) diff --git a/module/Application/view/partial/basicformfield.phtml b/module/Application/view/partial/basicformfield.phtml index e4f0750..96eb800 100644 --- a/module/Application/view/partial/basicformfield.phtml +++ b/module/Application/view/partial/basicformfield.phtml @@ -23,7 +23,7 @@ switch($oField->type) { * Textarea */ case 'textarea': ?> - + type) { allow_clear == 1) { ?> allowClear: true, - placeholder: '=$oField->label?>' + placeholder: '=$this->translate($oField->label)?>' }); type) { allow_clear == 1) { ?> allowClear: true, - placeholder: '=$oField->label?>' + placeholder: '=$this->translate($oField->label)?>' }); sTab,$this->layout()->aFormFieldsByTab)) {