From e1daf0ea127827505f28cdb0b7b6c8d7ec24750b Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Mon, 16 May 2022 11:43:07 +0200
Subject: [PATCH] fix routes pluralizations
---
.../university/people/alumni_controller.rb | 2 +-
.../people/alumni/edit_cohorts.html.erb | 4 ++--
.../university/people/alumni/show.html.erb | 4 ++--
db/schema.rb | 19 +------------------
4 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/app/controllers/admin/university/people/alumni_controller.rb b/app/controllers/admin/university/people/alumni_controller.rb
index 0123d44b7..ba34e709c 100644
--- a/app/controllers/admin/university/people/alumni_controller.rb
+++ b/app/controllers/admin/university/people/alumni_controller.rb
@@ -41,7 +41,7 @@ class Admin::University::People::AlumniController < Admin::University::Applicati
super
add_breadcrumb University::Person::Alumnus.model_name.human(count: 2),
admin_university_people_alumni_path
- add_breadcrumb @alumnus, admin_university_person_alumnus_path(@alumnus) if @alumnus
+ add_breadcrumb @alumnus, admin_university_people_alumni_path(@alumnus) if @alumnus
end
def alumnus_params
diff --git a/app/views/admin/university/people/alumni/edit_cohorts.html.erb b/app/views/admin/university/people/alumni/edit_cohorts.html.erb
index 5cc53c3ef..c129197dc 100644
--- a/app/views/admin/university/people/alumni/edit_cohorts.html.erb
+++ b/app/views/admin/university/people/alumni/edit_cohorts.html.erb
@@ -2,7 +2,7 @@
<h2 class="h3"><%= Education::Program.model_name.human(count: 2) %></h2>
-<%= simple_form_for [:admin, @alumnus], url: edit_cohorts_admin_university_person_alumnus_path(@alumnus) do |f| %>
+<%= simple_form_for [:admin, @alumnus], url: edit_cohorts_admin_university_people_alumni_path(@alumnus) do |f| %>
<%= f.error_notification %>
<%= f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present? %>
@@ -21,7 +21,7 @@
<div class="col-md-10">
<div id="cohorts">
<%= f.simple_fields_for :cohorts, @alumnus.cohorts.ordered, include_id: false do |cohort_f| %>
- <%= render 'admin/university/person/alumni/cohort_fields', f: cohort_f, include_id: true %>
+ <%= render 'admin/university/people/alumni/cohort_fields', f: cohort_f, include_id: true %>
<% end %>
</div>
</div>
diff --git a/app/views/admin/university/people/alumni/show.html.erb b/app/views/admin/university/people/alumni/show.html.erb
index 7ee7ad53c..45ee95df4 100644
--- a/app/views/admin/university/people/alumni/show.html.erb
+++ b/app/views/admin/university/people/alumni/show.html.erb
@@ -2,7 +2,7 @@
<%= render 'admin/university/people/main_infos', person: @alumnus %>
-<%= render 'admin/university/person/alumni/show/cohorts', cohorts: @cohorts, param_name: 'cohorts_page' %>
+<%= render 'admin/university/people/alumni/show/cohorts', cohorts: @cohorts, param_name: 'cohorts_page' %>
<%# TODO: remove %>
<% if @alumnus.cohorts.any? %>
@@ -16,5 +16,5 @@
<% content_for :action_bar_right do %>
<%= edit_link @alumnus %>
- <%= link_to t('university.manage_cohorts'), edit_cohorts_admin_university_person_alumnus_path(@alumnus), class: button_classes if can?(:update, @alumnus) %>
+ <%= link_to t('university.manage_cohorts'), edit_cohorts_admin_university_people_alumnus_path(@alumnus), class: button_classes if can?(:update, @alumnus) %>
<% end %>
diff --git a/db/schema.rb b/db/schema.rb
index 0968b7525..7ebb55924 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -503,23 +503,6 @@ ActiveRecord::Schema.define(version: 2022_05_15_082819) do
t.index ["university_id"], name: "index_education_schools_on_university_id"
end
- create_table "external_organizations", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
- t.string "title"
- t.text "description"
- t.string "address"
- t.string "zipcode"
- t.string "city"
- t.string "country"
- t.string "website"
- t.string "phone"
- t.string "mail"
- t.boolean "active"
- t.string "sirene"
- t.integer "kind"
- t.datetime "created_at", precision: 6, null: false
- t.datetime "updated_at", precision: 6, null: false
- end
-
create_table "languages", id: :uuid, default: -> { "gen_random_uuid()" }, force: :cascade do |t|
t.string "name"
t.string "iso_code"
@@ -710,8 +693,8 @@ ActiveRecord::Schema.define(version: 2022_05_15_082819) do
t.string "linkedin"
t.boolean "is_alumnus", default: false
t.text "description_short"
- t.string "name"
t.boolean "is_author"
+ t.string "name"
t.index ["university_id"], name: "index_university_people_on_university_id"
t.index ["user_id"], name: "index_university_people_on_user_id"
end
--
GitLab