Commit c18e59d5 authored by Christian Mahnke's avatar Christian Mahnke

Merge branch 'dev'

parents 32aee562 62c43d1b
Pipeline #114439 passed with stages
in 8 minutes and 38 seconds
......@@ -9,7 +9,7 @@ easy_admin:
- 'build/css/app.css'
brand_color: '#073d73'
menu:
- { label: 'Search', icon: 'search', url: 'search', target: '_blank'}
# - { label: 'Search', icon: 'search', url: 'search', target: '_blank'}
- label: 'Inscriptions'
- { entity: 'Inscriptions', label: 'Defined Inscriptions', icon: 'list', default: true }
- { entity: 'Inscriptions', label: 'Add Inscript', icon: 'plus', params: { action: 'new' }}
......@@ -213,4 +213,4 @@ easy_admin:
- { property: 'type', label: 'Type' }
- { property: 'religion', label: 'Religion' }
- { property: 'FamilyMembersOfPerson', label: 'Family Members' }
- remarks
\ No newline at end of file
- remarks
......@@ -34,7 +34,7 @@ security:
- { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
- { path: ^/, role: [ROLE_ADMIN, ROLE_USER]}
- { path: ^/search/, role: [ROLE_ADMIN, ROLE_USER]}
# - { path: ^/search/, role: [ROLE_ADMIN, ROLE_USER]}
encoders:
FOS\UserBundle\Model\UserInterface: bcrypt
......@@ -42,4 +42,4 @@ security:
role_hierarchy:
ROLE_ADMIN: ROLE_ADMIN
ROLE_SUPER_ADMIN: ROLE_ADMIN
ROLE_USER: ROLE_USER
\ No newline at end of file
ROLE_USER: ROLE_USER
......@@ -3,4 +3,7 @@
cd $WORKDIR
# 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
# TODO: Reenable this
echo "Reindexing is currently disabled!"
# php bin/console fos:elastica:populate --no-debug --no-reset --env=prod
......@@ -24,3 +24,37 @@ Status and TODO
# TODO
See [GitLab Issues](https://gitlab.gwdg.de/subugoe/theology-inscriptions/issues).
<a name="search" />
# Reenable Search
Currently the search is disabled, the following files have been changed:
| Type | File | Short description | Revision of disabling change |
|----------|---------------------------------------|------------------------------------------|------------------------------------------------------------------------------------------------------------------|
| GUI | `config/packages/easy_admin.yaml` | Menu entry | [dde245a2](https://gitlab.gwdg.de/subugoe/theology-inscriptions/commit/dde245a2add45d3a1b1cc3f7469cebf5011f8e32) |
| Backend | `config/bundles.php` | Load point of the library | [50e440a2](https://gitlab.gwdg.de/subugoe/theology-inscriptions/commit/50e440a2e651ef32cdc7cdfd9de34b4762b51ba1) |
| Security | `config/packages/security.yaml` | Security entry for the `search` route | [298bbb90](https://gitlab.gwdg.de/subugoe/theology-inscriptions/commit/298bbb909b1541d591db630b5e367ced22950238) |
| GUI | `src/Controller/SearchController.php` | Implementation of `search`route | [e3fc1fe5](https://gitlab.gwdg.de/subugoe/theology-inscriptions/commit/e3fc1fe5faf1bc97c8daa34f5ce7f43e47a0aa67) |
| Build | `docker/app/entrypoint.d/reindex.sh` | Reindexing script (devel and deployment) | [9a22a641](https://gitlab.gwdg.de/subugoe/theology-inscriptions/commit/9a22a6410284632887b5daf24ff14c3c33008f03) |
| Build | `docker/app/entrypoint.d/reindex.sh` | Reindexing script (devel and deployment) | [9ef6031a](https://gitlab.gwdg.de/subugoe/theology-inscriptions/commit/9ef6031aeffec660fb116389761f0358e3436f27) |
Type 'GUI' means her, that only the user interface is affected. 'Security' is related to GUI access regulations. 'Build' are
changes related to the build system. 'Backend' relates to changes to the backend.
## Other ways to de- and reactivate the Elasticsearch extension
Since the above actions din't really work `composer` has been used to get rid of elastic search.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
php73 composer.phar remove friendsofsymfony/elastica-bundle --no-scripts --optimize-autoloader --classmap-authoritative
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Additionally `docker/app/Dockerfile` and `docker/app/entrypoint.d/composer-init.sh` has been changed
to stop the change of the configuration file and reindexing.
## Deactivating the FOSElastica extension
Currently is seems to be impossible to get rid of FOSElastica. Neither the `composer` way nor deactivating the bundle seem to
work easily, since there are still some leftovers.
\ No newline at end of file
......@@ -29,7 +29,8 @@ class SearchController extends AbstractController
$this->finder = $finder;
}
/**
* @Route("/search", name="app_home_page")
* TODO: Remove the space between @-sign and 'Route' to reenable this
* @ Route("/search", name="app_home_page")
*/
public function index(Request $request, $finder, $mngr )
{
......
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