Merge branch 'master' of github.com:noesya/osuny

app/models/university/person/involvement.rb

@@ -34,6 +34,7 @@ class University::Person::Involvement < ApplicationRecord
   belongs_to :target, polymorphic: true
 
   validates :person_id, uniqueness: { scope: [:target_id, :target_type] }
+  validates :target_id, uniqueness: { scope: [:person_id, :target_type] }
 
   before_validation :set_kind, on: :create
   before_validation :set_university_id, on: :create

app/views/admin/education/teachers/edit.html.erb

+<% content_for :title, @teacher %>
+
 <%= simple_form_for [:admin, @teacher], url: admin_education_teacher_path(@teacher) do |f| %>
   <div class="card flex-fill w-100">
     <div class="card-header">

app/views/admin/education/teachers/show.html.erb

@@ -44,5 +44,5 @@
 <% end %>
 
 <% content_for :action_bar_right do %>
-  <%= link_to t('edit'), edit_admin_education_teacher_path(@teacher), class: button_classes if can?(:manage, University::Person::Involvement) %>
+  <%= link_to t('education.manage_programs'), edit_admin_education_teacher_path(@teacher), class: button_classes if can?(:manage, University::Person::Involvement) %>
 <% end %>

config/locales/education/en.yml

@@ -50,6 +50,8 @@ en:
         websites: Associated websites
         zipcode: Zipcode
   education:
+    manage_programs: Manage programs
+    manage_roles: Manage roles
     manage_teachers: Manage teachers
     number_of_programs: Number of programs
     program:
@@ -59,6 +61,8 @@ en:
     roles:
       one: Role
       other: Roles
+    schools:
+      manage_roles: Manage the team
     teachers:
       one: Teacher
       other: Teachers

config/locales/education/fr.yml

@@ -50,6 +50,7 @@ fr:
         websites: Sites webs associés
         zipcode: Code postal
   education:
+    manage_programs: Gérer les formations
     manage_roles: Gérer les rôles
     manage_teachers: Gérer les enseignants·es
     number_of_programs: Nombre de formations

config/locales/university/en.yml

@@ -35,6 +35,9 @@ en:
         slug: Slug
         tenure: Have tenure?
         user: User
+      university/person/involvement:
+        person: Person
+        target_id: ''
       university/role:
         description: Description
         people: People

config/locales/university/fr.yml

@@ -35,6 +35,9 @@ fr:
         slug: Slug
         tenure: Titulaire ?
         user: Utilisateur
+      university/person/involvement:
+        person: Personne
+        target_id: ''
       university/role:
         description: Description
         people: Personnes