diff --git a/app/controllers/admin/university/people_controller.rb b/app/controllers/admin/university/people_controller.rb index e82dd9efb708d814f0aaf8bc3ac3315b1a923a8f..8f94edcb1b80983558b82f0bfaea178e8d98f5ab 100644 --- a/app/controllers/admin/university/people_controller.rb +++ b/app/controllers/admin/university/people_controller.rb @@ -94,6 +94,9 @@ class Admin::University::PeopleController < Admin::University::ApplicationContro :habilitation, :tenure, :url, :linkedin, :twitter, :mastodon, :is_researcher, :is_teacher, :is_administration, :is_alumnus, :hal_person_identifier, :user_id - ).merge(university_id: current_university.id) + ).merge( + university_id: current_university.id, + language_id: current_university.default_language_id + ) end end diff --git a/app/models/user/with_person.rb b/app/models/user/with_person.rb index 58fdb16dc840ff8d831b46ef71c9de8059e55777..dbebb00057ef1745e05897dea070661a153d3ef4 100644 --- a/app/models/user/with_person.rb +++ b/app/models/user/with_person.rb @@ -19,6 +19,7 @@ module User::WithPerson person.last_name = last_name person.slug = person.to_s.parameterize person.user = self + person.language_id ||= university.default_language_id person.save end diff --git a/app/views/admin/dashboard/namespace.html.erb b/app/views/admin/dashboard/namespace.html.erb index 1e8410e88ce679519ca2d55584455a4891fb9ed7..28069ead43796cfa701bd096beb96a36673ee555 100644 --- a/app/views/admin/dashboard/namespace.html.erb +++ b/app/views/admin/dashboard/namespace.html.erb @@ -1,9 +1,29 @@ <% content_for :title, @namespace.model_name.human %> -<div class="row mb-5"> +<div class="row"> <div class="col-lg-7"> - <p class="lead"><i><%= t "#{@namespace.to_s.underscore}.description.text" %></i></p> - <p>— <%= t "#{@namespace.to_s.underscore}.description.source" %></p> + <div> + <p class="lead"><i><%= t "#{@namespace.to_s.underscore}.description.text" %></i></p> + <p>— <%= t "#{@namespace.to_s.underscore}.description.source" %></p> + </div> + <div class="row pt-5 mt-5"> + <% @namespace.parts.each do |part| %> + <% + class_name = part.first + path = send part.last + title = class_name.model_name.human(count: 2) + description = class_name.human_attribute_name('description') + # TODO + description = t 'administration.qualiopi.description' if class_name == Administration::Qualiopi + %> + <div class="col-lg-6 mt-5"> + <%= osuny_panel title do %> + <p><%= description %></p> + <%= link_to t('show'), path, class: 'stretched-link' %> + <% end %> + </div> + <% end %> + </div> </div> <% if current_admin_theme == 'pure' %> <div class="offset-lg-1 col-lg-4"> @@ -15,22 +35,3 @@ </div> <% end %> </div> - -<div class="row"> - <% @namespace.parts.each do |part| %> - <% - class_name = part.first - path = send part.last - title = class_name.model_name.human(count: 2) - description = class_name.human_attribute_name('description') - # TODO - description = t 'administration.qualiopi.description' if class_name == Administration::Qualiopi - %> - <div class="col-lg-4 mt-4"> - <%= osuny_panel title do %> - <p><%= description %></p> - <%= link_to t('show'), path, class: 'stretched-link' %> - <% end %> - </div> - <% end %> -</div> \ No newline at end of file