Fix: not working currency settings, reworked DataLoading for CreateAc…

…tion
Volmarg · Aug 31, 2020 · f49e51f · f49e51f
1 parent be2166f
commit f49e51f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/public/assets/app.js b/public/assets/app.js
diff --git a/src/assets/scripts/core/ui/Actions/CreateAction.ts b/src/assets/scripts/core/ui/Actions/CreateAction.ts
@@ -45,16 +45,13 @@ export default class CreateAction extends AbstractAction {
             let processedEntityName               = form.attr('data-entity');
             let singleProcessedFormDefinitionName = form.attr('data-form-target');
 
-            let isEntityBasedForm   = ("undefined" != typeof processedEntityName);
-
             /**
              * @description build data bag for request using either entity based form or single-target one
              *              and build callbacks used after receiving backend response
              */
-            var dataProcessorDto = null as DataProcessorDto;
-            if(isEntityBasedForm){
-                dataProcessorDto = DataProcessorLoader.getCreateDataProcessorDto(DataProcessorLoader.PROCESSOR_TYPE_ENTITY, processedEntityName);
-            }else{
+            let dataProcessorDto = DataProcessorLoader.getCreateDataProcessorDto(DataProcessorLoader.PROCESSOR_TYPE_ENTITY, processedEntityName);
+
+            if( !(dataProcessorDto instanceof DataProcessorDto) ){
                 dataProcessorDto = DataProcessorLoader.getCreateDataProcessorDto(DataProcessorLoader.PROCESSOR_TYPE_SPECIAL_ACTION, singleProcessedFormDefinitionName);
             }
 

diff --git a/templates/page-elements/settings/components/finances/finances-currencies-settings.html.twig b/templates/page-elements/settings/components/finances/finances-currencies-settings.html.twig
@@ -64,7 +64,7 @@
         <div class="bgc-white bd bdrs-3 p-20 mB-20 d-flex flex-column">
             <h4 class="c-grey-900 mB-20 align-self-center">{{ 'settings.finances.type.currencies.addCurrency' | trans }}</h4>
             <div class="col-md-6 align-self-center add-record-form">
-                {{ form(currency_form, {'attr':{' data-entity':"settingsFinancesCurrencyForm"}})}}
+                {{ form(currency_form, {'attr':{'data-form-target':"settingsFinancesCurrencyForm"}})}}
             </div>
         </div>
     </div>