From 90abb545266bc17a4896182f7914cfdc11105170 Mon Sep 17 00:00:00 2001 From: Arnaud Levy <contact@arnaudlevy.com> Date: Mon, 5 Dec 2022 09:34:06 +0100 Subject: [PATCH] wip --- .../communication/website/{previous_link.rb => permalink.rb} | 2 +- app/models/communication/website/permalink/page.rb | 4 ++++ .../static/{_aliases.html.erb => _permalink.html.erb} | 4 ++++ .../admin/communication/websites/categories/static.html.erb | 3 +-- app/views/admin/communication/websites/pages/static.html.erb | 3 +-- app/views/admin/communication/websites/posts/static.html.erb | 3 +-- app/views/admin/university/people/static.html.erb | 3 +-- 7 files changed, 13 insertions(+), 9 deletions(-) rename app/models/communication/website/{previous_link.rb => permalink.rb} (94%) create mode 100644 app/models/communication/website/permalink/page.rb rename app/views/admin/application/static/{_aliases.html.erb => _permalink.html.erb} (56%) diff --git a/app/models/communication/website/previous_link.rb b/app/models/communication/website/permalink.rb similarity index 94% rename from app/models/communication/website/previous_link.rb rename to app/models/communication/website/permalink.rb index b099d84c6..662016a1a 100644 --- a/app/models/communication/website/previous_link.rb +++ b/app/models/communication/website/permalink.rb @@ -21,7 +21,7 @@ # fk_rails_e9646cce64 (university_id => universities.id) # fk_rails_f389ba7d45 (website_id => communication_websites.id) # -class Communication::Website::PreviousLink < ApplicationRecord +class Communication::Website::Permalink < ApplicationRecord include Sanitizable include WithUniversity diff --git a/app/models/communication/website/permalink/page.rb b/app/models/communication/website/permalink/page.rb new file mode 100644 index 000000000..3bb3cfc4a --- /dev/null +++ b/app/models/communication/website/permalink/page.rb @@ -0,0 +1,4 @@ +class Communication::Website::Permalink::Page + + +end \ No newline at end of file diff --git a/app/views/admin/application/static/_aliases.html.erb b/app/views/admin/application/static/_permalink.html.erb similarity index 56% rename from app/views/admin/application/static/_aliases.html.erb rename to app/views/admin/application/static/_permalink.html.erb index 49554b22a..32b39f787 100644 --- a/app/views/admin/application/static/_aliases.html.erb +++ b/app/views/admin/application/static/_permalink.html.erb @@ -1,3 +1,7 @@ +url: "<%= @about.permalink_in_website(@website) %>" +<% if @about&.slug %> +slug: "<%= @about.slug %>" +<% end %> <% if @about.previous_links.any? %> aliases: <% @about.previous_links.each do |previous_link| %> diff --git a/app/views/admin/communication/websites/categories/static.html.erb b/app/views/admin/communication/websites/categories/static.html.erb index 7a6e98fe2..22040b310 100644 --- a/app/views/admin/communication/websites/categories/static.html.erb +++ b/app/views/admin/communication/websites/categories/static.html.erb @@ -1,10 +1,9 @@ --- title: "<%= @about.name %>" -slug: "<%= @about.path %>" +<%= render 'admin/application/static/permalink' %> <% if @about.parent %> parent: "<%= @about.parent.path %>" <% end %> -<%= render 'admin/application/static/aliases' %> position: <%= @about.position %> <%= render 'admin/communication/unsplash/static' %> description: > diff --git a/app/views/admin/communication/websites/pages/static.html.erb b/app/views/admin/communication/websites/pages/static.html.erb index 93a4a55a9..e796ab212 100644 --- a/app/views/admin/communication/websites/pages/static.html.erb +++ b/app/views/admin/communication/websites/pages/static.html.erb @@ -2,8 +2,7 @@ title: > <%= @about.title %> breadcrumb_title: "<%= @about.breadcrumb_title.blank? ? @about.title : @about.breadcrumb_title %>" -url: "<%= @about.path %>" -<%= render 'admin/application/static/aliases' %> +<%= render 'admin/application/static/permalink' %> position: <%= @about.position %> full_width: <%= @about.full_width %> bodyclass: <%= @about.best_bodyclass %> diff --git a/app/views/admin/communication/websites/posts/static.html.erb b/app/views/admin/communication/websites/posts/static.html.erb index 7902f7ac6..cefbf836c 100644 --- a/app/views/admin/communication/websites/posts/static.html.erb +++ b/app/views/admin/communication/websites/posts/static.html.erb @@ -1,8 +1,7 @@ --- title: "<%= @about.title %>" date: "<%= @about.published_at.iso8601 %>" -slug: "<%= @about.slug %>" -<%= render 'admin/application/static/aliases' %> +<%= render 'admin/application/static/permalink' %> <% if @about.pinned %> weight: 1 <% end %> diff --git a/app/views/admin/university/people/static.html.erb b/app/views/admin/university/people/static.html.erb index 992528db4..c04f73f89 100644 --- a/app/views/admin/university/people/static.html.erb +++ b/app/views/admin/university/people/static.html.erb @@ -1,8 +1,7 @@ --- title: > <%= @about.to_s %> -slug: "<%= @about.slug %>" -<%= render 'admin/application/static/aliases' %> +<%= render 'admin/application/static/permalink' %> first_name: > <%= @about.first_name %> last_name: > -- GitLab