Commit 32aee562 authored by Christian Mahnke's avatar Christian Mahnke

Merge branch 'dev'

parents fe083c87 265571f7
Pipeline #114312 passed with stages
in 8 minutes and 23 seconds
......@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e507104f84a2369b2de8c8569e8e6bef",
"content-hash": "4787c03d0a6d283a74d1b039beb8d6f0",
"packages": [
{
"name": "composer/ca-bundle",
......
......@@ -74,7 +74,7 @@ easy_admin:
- { name: 'edit', icon: 'pencil', label: 'Edit' }
- { name: 'delete', label: 'Delete' }
- { name: 'new', label: 'Add new' }
sort: 'siglum'
sort: ['siglum', 'ASC']
# User:
# class: App\Entity\User
# permissions:
......@@ -147,7 +147,7 @@ easy_admin:
- { name: 'edit', icon: 'pencil', label: 'Edit' }
- { name: 'delete', label: 'Delete' }
- { name: 'new', label: 'Add new'}
sort: 'name'
sort: ['name', 'ASC']
show:
fields: ['id','name','language','philologicalAnalysis','remarks']
......@@ -200,7 +200,7 @@ easy_admin:
# - { name: 'add', icon: 'plus', label: 'Add' }
- { name: 'delete', label: 'Delete' }
- { name: 'new', label: 'Add new' }
sort: 'fullname'
sort: ['fullname', 'ASC']
show:
title: 'Show %%entity_label%% (#%%entity_id%%)'
fields:
......
#!/bin/bash
cd $WORKDIR
php bin/console fos:elastica:populate
\ No newline at end of file
# Use `--no-debug`, see https://github.com/FriendsOfSymfony/FOSElasticaBundle/issues/791
# For the other options see https://stackoverflow.com/questions/24451983/populating-foselasticabundle-running-out-of-php-memory-possible-memory-leak
php bin/console fos:elastica:populate --no-debug --no-reset --env=prod
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment