diff --git a/app/controllers/admin/university/people/alumni_controller.rb b/app/controllers/admin/university/people/alumni_controller.rb index 0123d44b7918016c381292720043a467928263dc..ba34e709c7373c86adaec9ac7aad5e6090420405 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 5cc53c3ef5f2efd63a0a5ade2d1527f03e620565..c129197dc159ad92734910be48e8083a867a2a26 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 7ee7ad53cacea6d9e59e955a00060cd783f08542..45ee95df477410c48821ce448021b70486c327fd 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 0968b7525eed32611fabd1a576e5dc7fa4e0a72c..7ebb559247308d09b57e482e3e33ae5898ec47ac 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