static

app/models/communication/website/permalink.rb

@@ -74,7 +74,7 @@ class Communication::Website::Permalink < ApplicationRecord
 
   def computed_path
     return nil unless published?
-    @computed_path ||= published_path
+    @computed_path ||= Static.clean_path(published_path)
   end
 
   protected
@@ -91,4 +91,5 @@ class Communication::Website::Permalink < ApplicationRecord
   def set_university
     self.university_id = website.university_id
   end
+
 end

app/models/communication/website/permalink/category.rb

@@ -8,7 +8,7 @@ class Communication::Website::Permalink::Category < Communication::Website::Perm
   end
 
   def self.pattern_in_website(website)
-    "#{self.special_page(:communication_posts).path_without_language}:slug/"
+    "#{website.special_page(:communication_posts).path_without_language}:slug/"
   end
 
   protected

app/models/concerns/with_permalink_in_website.rb

@@ -13,7 +13,7 @@ module WithPermalinkInWebsite
     new_permalink = Communication::Website::Permalink.for_object(self, website)
 
     # If the object had no permalink or if its path changed, we create a new permalink
-    if last_permalink.nil? || new_permalink.computed_path.present? && last_permalink.path != new_permalink.computed_path
+    if new_permalink.computed_path.present? && (last_permalink.nil? || last_permalink.path != new_permalink.computed_path)
       last_permalink&.update(is_current: false)
       new_permalink.path = new_permalink.computed_path
       new_permalink.save

app/views/admin/communication/websites/categories/static.html.erb

 ---
 title: "<%= @about.name %>"
-<%#= render 'admin/application/static/permalink' %>
+<%= render 'admin/application/static/permalink' %>
 <% if @about.parent %>
 parent: "<%= @about.parent.path %>"
 <% end %>

app/views/admin/education/diplomas/static.html.erb

 ---
 title: >
   <%= prepare_text_for_static @about.name %>
-slug: "<%= @about.slug %>"
+<%= render 'admin/application/static/permalink' %>
 short_name: >
   <%= prepare_text_for_static @about.short_name %>
 level: <%= @about.level_i18n %>

app/views/admin/university/organizations/static.html.erb

 ---
 title: >
   <%= @about.to_s %>
-slug: "<%= @about.slug %>"
+<%= render 'admin/application/static/permalink' %>
 long_name: >
   <%= @about.long_name %>
 kind: "<%= @about.kind %>"

app/views/admin/university/people/administrators/static.html.erb

 ---
 title: >
   Responsabilités de <%= @about.to_s %>
+<%= render 'admin/application/static/permalink' %>
 person: >
   <%= @about.to_s %>
 first_name: >
   <%= @about.first_name %>
 last_name: >
   <%= @about.last_name %>
-slug: "<%= @about.slug %>"
 description: >
   <%= prepare_text_for_static @about.description %>
 ---

app/views/admin/university/people/authors/static.html.erb

 ---
 title: >
   Actualités de <%= @about.to_s %>
+<%= render 'admin/application/static/permalink' %>
 person: >
   <%= @about.to_s %>
 first_name: >
   <%= @about.first_name %>
 last_name: >
   <%= @about.last_name %>
-slug: "<%= @about.slug %>"
 description: >
   <%= prepare_text_for_static @about.description %>
 ---

app/views/admin/university/people/researchers/static.html.erb

 ---
 title: >
   Publications de <%= @about.to_s %>
+<%= render 'admin/application/static/permalink' %>
 person: >
   <%= @about.to_s %>
 first_name: >
   <%= @about.first_name %>
 last_name: >
   <%= @about.last_name %>
-slug: "<%= @about.slug %>"
 description: >
   <%= prepare_text_for_static @about.description %>
 ---

app/views/admin/university/people/teachers/static.html.erb

 ---
 title: >
   Enseignements de <%= @about.to_s %>
+<%= render 'admin/application/static/permalink' %>
 person: >
   <%= @about.to_s %>
 first_name: >
   <%= @about.first_name %>
 last_name: >
   <%= @about.last_name %>
-slug: "<%= @about.slug %>"
 description: >
   <%= prepare_text_for_static @about.description %>
 ---