Merge branch 'dev'

This commit is contained in:
gregoirenovel 2017-11-22 11:32:51 +01:00
commit ef4ca2c29e
4 changed files with 5 additions and 3 deletions

View file

@ -1,5 +1,5 @@
module NewGestionnaire
class RecherchesController < GestionnaireController
class RechercheController < GestionnaireController
def index
@search_terms = params[:q]

View file

@ -1,3 +1,5 @@
- content_for(:title, "Recherche : #{@search_terms}")
.container
.backoffice-title
Résultat de la recherche :

View file

@ -270,7 +270,7 @@ Rails.application.routes.draw do
post 'avis' => 'avis#create_avis'
end
end
get "recherche" => "recherches#index"
get "recherche" => "recherche#index"
end
apipie

View file

@ -1,6 +1,6 @@
require 'spec_helper'
describe NewGestionnaire::RecherchesController, type: :controller do
describe NewGestionnaire::RechercheController, type: :controller do
let(:dossier) { create(:dossier, :initiated) }
let(:dossier2) { create(:dossier, :initiated, procedure: dossier.procedure) }
let(:gestionnaire) { create(:gestionnaire) }