DGNum/demarches-normaliennes
14
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5448 from betagouv/dev

Browse source
This commit is contained in:
Pierre de La Morinerie 2020-08-05 14:00:53 +02:00 committed by GitHub
commit 634a78bad4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/admin/instructeurs/index.html.haml
View file

@ -18,7 +18,7 @@
.col-xs-6 .col-xs-6
%h3 Ajouter un instructeur %h3 Ajouter un instructeur
#procedure_new.section.section-label #procedure_new.section.section-label
= form_with url: { controller: 'admin/instructeurs', action: :create } do = form_with url: { controller: 'admin/instructeurs', action: :create }, local: true do
.row .row
.col-xs-5 .col-xs-5
= render partial: 'admin/instructeurs/informations' = render partial: 'admin/instructeurs/informations'

2
app/views/new_administrateur/procedures/jeton.html.haml
View file

@ -9,7 +9,7 @@
.container .container
%h1 %h1
= form_with model: @procedure, url: url_for({ controller: 'new_administrateur/procedures', action: :update_jeton }), html: { class: 'form' } do |f| = form_with model: @procedure, url: url_for({ controller: 'new_administrateur/procedures', action: :update_jeton }), local: true, html: { class: 'form' } do |f|
%p.explication %p.explication
Démarches Simplifiées utilise Démarches Simplifiées utilise
= link_to 'API Entreprise', "https://entreprise.api.gouv.fr/" = link_to 'API Entreprise', "https://entreprise.api.gouv.fr/"

2
app/views/new_administrateur/services/_form.html.haml
View file

@ -1,4 +1,4 @@
= form_with model: [ :admin, service] , html: { class: 'form' } do |f| = form_with model: [ :admin, service], local: true, html: { class: 'form' } do |f|
= f.label :nom do = f.label :nom do
Nom Nom

3
config/application.rb
View file

@ -11,7 +11,8 @@ Dotenv::Railtie.load
module TPS module TPS
class Application < Rails::Application class Application < Rails::Application
config.load_defaults 5.0 config.load_defaults 5.1
# Settings in config/environments/* take precedence over those specified here. # Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers # Application configuration should go into files in config/initializers
# -- all .rb files in that directory are automatically loaded. # -- all .rb files in that directory are automatically loaded.