Sfoglia il codice sorgente

Merge branch 'hotfix-xls' into 'master'

Fixed yml and composer.lock

See merge request interlink-sa/flowdat3/modules/ftth!160
Jean Sumara Leopoldo 5 anni fa
parent
commit
7d5b2ea08e
3 ha cambiato i file con 4 aggiunte e 2 eliminazioni
  1. 2 1
      .gitignore
  2. 1 1
      composer.lock
  3. 1 0
      src/FTTHBundle/Resources/config/services.yml

+ 2 - 1
.gitignore

@@ -23,4 +23,5 @@ app/Resources/workflows/workflow_list.yml
 /web/workflows_png/*
 !web/workflows_png/.gitkeep
 /app/config/bundles/ik/base-admin-bundle/parameters.yml
-.idea
+.idea
+.vscode

+ 1 - 1
composer.lock

@@ -1947,7 +1947,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "eea76808c6359a23eeadf81615617bc7f1b21f72"
+                "reference": "0aa4a549ba1e2583bc1e2c05342ed5597d68cb56"
             },
             "type": "library",
             "autoload": {

+ 1 - 0
src/FTTHBundle/Resources/config/services.yml

@@ -6,6 +6,7 @@ services:
             - { name: sonata.admin, manager_type: orm, group: FTTH, label: ONU, label_catalogue: FTTHBundle, label_translator_strategy: sonata.admin.label.strategy.underscore, icon: '<i class="fa fa-tasks"></i>' }
         calls:
             - [setTranslationDomain, [FTTHBundle]]
+            - [setModelManager, ['@base_admin.model.manager']]
 
     sonata.admin.onutemplate:
         class: FTTHBundle\Admin\ONUTemplateAdmin