Skip to content
Snippets Groups Projects
Unverified Commit ce8427ea authored by Sébastien Gaya's avatar Sébastien Gaya
Browse files

sirene => siren

parent f53dda93
No related branches found
No related tags found
No related merge requests found
......@@ -60,7 +60,7 @@ class Admin::University::OrganizationsController < Admin::University::Applicatio
def organization_params
params.require(:university_organization)
.permit(
:name, :long_name, :slug, :description, :active, :sirene, :kind,
:name, :long_name, :slug, :description, :active, :siren, :kind,
:address, :zipcode, :city, :country, :text,
:url, :phone, :email, :logo, :logo_delete
)
......
......@@ -45,7 +45,7 @@
</div>
<div class="col-md-6">
<%= f.input :kind, include_blank: false %>
<%= f.input :sirene %>
<%= f.input :siren %>
</div>
</div>
</div>
......
......@@ -54,8 +54,8 @@
<div class="col-md-6">
<h3 class="h5"><%= University::Organization.human_attribute_name(:kind) %></h3>
<p><%= @organization.kind_i18n %></p>
<h3 class="h5"><%= University::Organization.human_attribute_name(:sirene) %></h3>
<p><%= @organization.sirene %></p>
<h3 class="h5"><%= University::Organization.human_attribute_name(:siren) %></h3>
<p><%= @organization.siren %></p>
</div>
</div>
</div>
......
......@@ -5,7 +5,7 @@ slug: "<%= @about.slug %>"
long_name: >
<%= @about.long_name %>
kind: "<%= @about.kind %>"
sirene: "<%= @about.sirene %>"
siren: "<%= @about.siren %>"
address: "<%= @about.address %>"
zipcode: "<%= @about.zipcode %>"
city: "<%= @about.city %>"
......
......@@ -62,7 +62,7 @@ en:
phone: Telephone
email: Email
kind: Kind
sirene: Legal identification number
siren: Legal identification number
university/organization/import:
file: File (.csv)
university/role:
......
......@@ -62,7 +62,7 @@ fr:
phone: Téléphone
email: Email
kind: Type
sirene: Numéro de SIRENE
siren: Numéro de SIREN
university/organization/import:
file: Fichier (.csv)
university/role:
......
......@@ -13,7 +13,7 @@ class CreateUniversityOrganizations < ActiveRecord::Migration[6.1]
t.string :phone
t.string :mail
t.boolean :active, default: true
t.string :sirene
t.string :siren
t.integer :kind, default: 10
t.timestamps
......
......@@ -17,7 +17,7 @@ class University::OrganizationsControllerTest < ActionDispatch::IntegrationTest
test "should create university_organization" do
assert_difference('University::Organization.count') do
post university_organizations_url, params: { university_organization: { active: @university_organization.active, address: @university_organization.address, city: @university_organization.city, country: @university_organization.country, description: @university_organization.description, kind: @university_organization.kind, mail: @university_organization.mail, phone: @university_organization.phone, sirene: @university_organization.sirene, title: @university_organization.title, website: @university_organization.website, zipcode: @university_organization.zipcode } }
post university_organizations_url, params: { university_organization: { active: @university_organization.active, address: @university_organization.address, city: @university_organization.city, country: @university_organization.country, description: @university_organization.description, kind: @university_organization.kind, mail: @university_organization.mail, phone: @university_organization.phone, siren: @university_organization.siren, title: @university_organization.title, website: @university_organization.website, zipcode: @university_organization.zipcode } }
end
assert_redirected_to university_organization_url(University::Organization.last)
......@@ -34,7 +34,7 @@ class University::OrganizationsControllerTest < ActionDispatch::IntegrationTest
end
test "should update university_organization" do
patch university_organization_url(@university_organization), params: { university_organization: { active: @university_organization.active, address: @university_organization.address, city: @university_organization.city, country: @university_organization.country, description: @university_organization.description, kind: @university_organization.kind, mail: @university_organization.mail, phone: @university_organization.phone, sirene: @university_organization.sirene, title: @university_organization.title, website: @university_organization.website, zipcode: @university_organization.zipcode } }
patch university_organization_url(@university_organization), params: { university_organization: { active: @university_organization.active, address: @university_organization.address, city: @university_organization.city, country: @university_organization.country, description: @university_organization.description, kind: @university_organization.kind, mail: @university_organization.mail, phone: @university_organization.phone, siren: @university_organization.siren, title: @university_organization.title, website: @university_organization.website, zipcode: @university_organization.zipcode } }
assert_redirected_to university_organization_url(@university_organization)
end
......
......@@ -43,7 +43,7 @@ one:
phone: MyString
mail: MyString
active: false
sirene: MyString
siren: MyString
kind: 1
two:
......@@ -57,5 +57,5 @@ two:
phone: MyString
mail: MyString
active: false
sirene: MyString
siren: MyString
kind: 1
......@@ -22,7 +22,7 @@ class University::OrganizationsTest < ApplicationSystemTestCase
fill_in "Kind", with: @university_organization.kind
fill_in "Mail", with: @university_organization.mail
fill_in "Phone", with: @university_organization.phone
fill_in "Sirene", with: @university_organization.sirene
fill_in "Siren", with: @university_organization.siren
fill_in "Title", with: @university_organization.title
fill_in "Website", with: @university_organization.website
fill_in "Zipcode", with: @university_organization.zipcode
......@@ -44,7 +44,7 @@ class University::OrganizationsTest < ApplicationSystemTestCase
fill_in "Kind", with: @university_organization.kind
fill_in "Mail", with: @university_organization.mail
fill_in "Phone", with: @university_organization.phone
fill_in "Sirene", with: @university_organization.sirene
fill_in "Siren", with: @university_organization.siren
fill_in "Title", with: @university_organization.title
fill_in "Website", with: @university_organization.website
fill_in "Zipcode", with: @university_organization.zipcode
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment