fix extranets

app/helpers/application_helper.rb

@@ -38,7 +38,6 @@ module ApplicationHelper
 
   def social_twitter_to_s(string)
     string.gsub('http://', 'https://')
-          .gsub('twitter.com', 'https://twitter.com')
           .gsub('https://www.twitter.com/', 'https://twitter.com/')
           .gsub('https://twitter.com/', '')
   end

app/models/education/academic_year.rb

@@ -19,9 +19,9 @@
 class Education::AcademicYear < ApplicationRecord
   include WithUniversity
 
-  has_many  :cohorts,
+  has_many  :education_cohorts,
             class_name: 'Education::Cohort'
-  alias_attribute :education_cohorts, :cohorts
+  alias_attribute :cohorts, :education_cohorts
 
   # Dénormalisation des alumni pour le faceted search
   has_and_belongs_to_many   :university_people,
@@ -30,7 +30,7 @@ class Education::AcademicYear < ApplicationRecord
                             association_foreign_key: 'university_person_id'
   has_many :people,
            class_name: 'University::Person',
-           through: :cohorts
+           through: :education_cohorts
 
   validates :year, numericality: { only_integer: true, greater_than: 0 }
 

app/models/education/program/with_alumni.rb

@@ -2,12 +2,12 @@ module Education::Program::WithAlumni
   extend ActiveSupport::Concern
 
   included do
-    has_many   :cohorts,
+    has_many   :education_cohorts,
                class_name: 'Education::Cohort'
-               alias_attribute :education_cohorts, :cohorts
+               alias_attribute :cohorts, :education_cohorts
 
     has_many   :alumni,
-               through: :cohorts,
+               through: :education_cohorts,
                source: :people
                alias_attribute :university_person_alumni, :alumni
 
@@ -41,7 +41,8 @@ module Education::Program::WithAlumni
     #            alias_attribute :education_academic_years, :academic_years
 
     def academic_years
-      Education::AcademicYear.where(id: cohorts.pluck(:academic_year_id))
+      Education::AcademicYear.where(id: education_cohorts.pluck(:academic_year_id))
     end
+    alias :education_academic_years :academic_years
   end
 end

app/models/education/school/with_alumni.rb

@@ -19,14 +19,14 @@ module Education::School::WithAlumni
                   source: :organization
                   alias_attribute :university_person_alumni_organizations, :alumni_organizations
 
-      has_many    :cohorts, -> { distinct },
+      has_many    :education_cohorts, -> { distinct },
                   class_name: 'Education::Cohort',
                   through: :programs
-                  alias_attribute :education_cohorts, :cohorts
-                  
+                  alias_attribute :cohorts, :education_cohorts
+
       has_many    :academic_years, -> { distinct },
                   class_name: 'Education::AcademicYear',
-                  through: :cohorts,
+                  through: :education_cohorts,
                   source: :academic_year
                   alias_attribute :education_academic_years, :academic_years