add search possibility throught all bundles, and remove deps between mainbundle and person bundle.

refs #223
This commit is contained in:
2014-11-25 14:50:05 +01:00
parent 0372ed4959
commit 740301227f
5 changed files with 133 additions and 8 deletions

View File

@@ -37,7 +37,7 @@ chill_person_create:
defaults: {_controller: ChillPersonBundle:Person:create }
chill_person_search:
pattern: /{_locale}/search
pattern: /{_locale}/person/search
defaults: { _controller: ChillPersonBundle:Person:search }
options:
menus:

View File

@@ -14,3 +14,12 @@ services:
- "@request"
tags:
- { name: form.type, alias: closing_motive }
chill.person.search_person:
class: Chill\PersonBundle\Search\PersonSearch
arguments:
- "@doctrine.orm.entity_manager"
calls:
- ['setContainer', ["@service_container"]]
tags:
- { name: chill.search, alias: 'person_search' }

View File

@@ -67,12 +67,15 @@
'Person Menu': "Menu personne"
#Person Controller
'Your query is empty. Be more explicive': Votre requête est vide. Veuillez introduire un terme de recherche
'Your query %q% gives no results': La requête <span class="research">%q%</span> ne renvoie aucun résultat.
'The person data are not valid': Les données de votre formulaire sont invalides.
'%nb% person with similar name. Please verify that this is a new person': %nb% personnes ont un nom similaire. Vérifiez qu'il ne s'agit pas de l'une d'elles.
'The person has been created': Le dossier a été créé
#search
'Person search results': Recherche de personnes
'No persons matching search %pattern%': Aucune personne ne correpond à votre recherche "%pattern%".
'%total% persons matching the search %pattern%': %total% personnes correspondent aux termes de recherche "%pattern%".
#History
'Last opening since %last_opening%': Dernière ouverture le %last_opening%.
'Close person history': Clotûrer

View File

@@ -14,10 +14,12 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
#}
{% extends "ChillMainBundle::layout.html.twig" %}
{% block title %}Recherche {{ pattern }}{% endblock %}
{% block content %}
<h2>{{ 'Person search results'|trans }}</h2>
{% if persons|length == 0 %}
<p>{{ 'No persons matching search %pattern%'|trans({'%pattern%' : pattern}) }}</p>
{% else %}
<p>{{ '%total% persons matching the search %pattern%'|trans({'%pattern%': pattern, '%total%' : total}) }}</p>
<table class="striped rounded">
<thead>
<tr>
@@ -53,4 +55,4 @@
{% endfor %}
</tbody>
</table>
{% endblock %}
{% endif %}