From bc98b4df9139d815671d3b6fc2556c9ad99d7af0 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Mon, 12 Dec 2022 12:11:18 +0100
Subject: [PATCH] fix permalinks
---
app/models/communication/website/permalink.rb | 1 +
app/models/education/diploma.rb | 3 ++-
app/models/education/program.rb | 21 ++++++++++---------
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/app/models/communication/website/permalink.rb b/app/models/communication/website/permalink.rb
index 7e415d8c3..8c44020ac 100644
--- a/app/models/communication/website/permalink.rb
+++ b/app/models/communication/website/permalink.rb
@@ -28,6 +28,7 @@ class Communication::Website::Permalink < ApplicationRecord
"Communication::Website::Page" => Communication::Website::Permalink::Page,
"Communication::Website::Post" => Communication::Website::Permalink::Post,
"Education::Diploma" => Communication::Website::Permalink::Diploma,
+ "Education::Program" => Communication::Website::Permalink::Program,
"University::Organization" => Communication::Website::Permalink::Organization,
"University::Person" => Communication::Website::Permalink::Person,
"University::Person::Administrator" => Communication::Website::Permalink::Administrator,
diff --git a/app/models/education/diploma.rb b/app/models/education/diploma.rb
index 9f3daf5bb..d902cb1db 100644
--- a/app/models/education/diploma.rb
+++ b/app/models/education/diploma.rb
@@ -22,10 +22,11 @@
# fk_rails_6cb2e9fa90 (university_id => universities.id)
#
class Education::Diploma < ApplicationRecord
- include WithUniversity
include WithBlocks
include WithGit
+ include WithPermalink
include WithSlug
+ include WithUniversity
has_many :programs, dependent: :nullify
diff --git a/app/models/education/program.rb b/app/models/education/program.rb
index daafad3e4..e12b4fc5b 100644
--- a/app/models/education/program.rb
+++ b/app/models/education/program.rb
@@ -51,21 +51,22 @@
class Education::Program < ApplicationRecord
include Aboutable
include Sanitizable
- include WithUniversity
- include WithGit
- include WithFeaturedImage
+ include WithAlumni
include WithBlobs
- include WithMenuItemTarget
- include WithSlug
- include WithTree
+ include WithBlocks
+ include WithDiploma
+ include WithFeaturedImage
+ include WithGit
include WithInheritance
+ include WithMenuItemTarget
+ include WithPermalink
include WithPosition
- include WithBlocks
include WithSchools
- include WithDiploma
- include WithAlumni
- include WithWebsites
+ include WithSlug
include WithTeam
+ include WithTree
+ include WithUniversity
+ include WithWebsites
rich_text_areas_with_inheritance :accessibility,
:contacts,
--
GitLab