diff --git a/app/models/communication/website/index_page.rb b/app/models/communication/website/index_page.rb index 93263f790067c15952aba15c48b9a73ca270cdf3..d1991abb102f7e13e39d27ee5694584c100d7797 100644 --- a/app/models/communication/website/index_page.rb +++ b/app/models/communication/website/index_page.rb @@ -58,7 +58,7 @@ class Communication::Website::IndexPage < ApplicationRecord end def git_dependencies(website) - [self] + active_storage_blobs + [self] + active_storage_blobs + website.menus end def git_destroy_dependencies(website) diff --git a/app/models/communication/website/post.rb b/app/models/communication/website/post.rb index ee138ee9a0527365743d212185bab04ec45e747f..6f810eaea49f76b5a214429abfa4527ee3113038 100644 --- a/app/models/communication/website/post.rb +++ b/app/models/communication/website/post.rb @@ -75,7 +75,14 @@ class Communication::Website::Post < ApplicationRecord end def git_dependencies(website) - [self] + [author, author&.author] + categories + active_storage_blobs + dependencies = [self] + dependencies += categories + dependencies += active_storage_blobs + if author.present? + dependencies += [author, author.author] + dependencies += author.active_storage_blobs + end + dependencies end def git_destroy_dependencies(website) diff --git a/app/models/education/program.rb b/app/models/education/program.rb index d2328f5b296f94eda3123c877eb6a665834bcb76..4d16201b61a0b7b9eca6a5b6aed1fc4024d9cdf1 100644 --- a/app/models/education/program.rb +++ b/app/models/education/program.rb @@ -145,10 +145,10 @@ class Education::Program < ApplicationRecord [self] + active_storage_blobs + university_people_through_involvements + - university_people_through_involvements.map(&:active_storage_blobs) + + university_people_through_involvements.map(&:active_storage_blobs).flatten + university_people_through_involvements.map(&:teacher) + university_people_through_role_involvements + - university_people_through_role_involvements.map(&:active_storage_blobs) + + university_people_through_role_involvements.map(&:active_storage_blobs).flatten + university_people_through_role_involvements.map(&:administrator) end diff --git a/app/models/education/school.rb b/app/models/education/school.rb index 924d1a25be74e002d6db16489742e17a05a276a1..9f1f98784c01be3139ad344f4c3f7b20bc94019b 100644 --- a/app/models/education/school.rb +++ b/app/models/education/school.rb @@ -68,6 +68,7 @@ class Education::School < ApplicationRecord def git_dependencies(website) [self] + university_people_through_role_involvements + - university_people_through_role_involvements.map(&:administrator) + university_people_through_role_involvements.map(&:administrator) + + university_people_through_role_involvements.map(&:active_storage_blobs).flatten end end diff --git a/app/models/research/journal.rb b/app/models/research/journal.rb index 65c3f09259bea5313da941f4c8cc377de9a3d69c..e34fdbcd3bd3d7f67cabcfe6bf70e5351114ef6b 100644 --- a/app/models/research/journal.rb +++ b/app/models/research/journal.rb @@ -40,7 +40,7 @@ class Research::Journal < ApplicationRecord end def git_dependencies(website) - [self] + articles + volumes + people + people.map(&:active_storage_blobs).flatten + people.map(&:researcher) + [self] + articles + volumes + people + people.map(&:researcher) + people.map(&:active_storage_blobs).flatten end def git_destroy_dependencies(website) diff --git a/app/views/admin/communication/website/posts/static.html.erb b/app/views/admin/communication/website/posts/static.html.erb index b9e5153805a8d3df28b3e7d3384cb4d666bce03e..6f4cf6c455b32aa4e9c902b19b9cc09bf6e9f213 100644 --- a/app/views/admin/communication/website/posts/static.html.erb +++ b/app/views/admin/communication/website/posts/static.html.erb @@ -1,6 +1,6 @@ --- title: "<%= @about.title %>" -date: <%= @about.published_at %> UTC +date: "<%= @about.published_at.iso8601 %>" slug: "<%= @about.slug %>" <% if @about.pinned %> weight: 1 diff --git a/app/views/admin/research/journal/articles/static.html.erb b/app/views/admin/research/journal/articles/static.html.erb index d9aa95b4177265d710646d0575d7c36f5efa920d..be28d7fc85071be00271788b9641194486695328 100644 --- a/app/views/admin/research/journal/articles/static.html.erb +++ b/app/views/admin/research/journal/articles/static.html.erb @@ -8,7 +8,7 @@ volumes: - "<%= @about.volume.path %>" <% end %> weight: <%= @about.position %> -date: <%= @about.published_at %> UTC +date: "<%= @about.published_at.iso8601 %>" <% if @about.pdf.attached? %> pdf: "<%= @about.pdf.blob_id %>" <% end %> diff --git a/app/views/admin/research/journal/volumes/static.html.erb b/app/views/admin/research/journal/volumes/static.html.erb index 82e3570f112c19433ea8932d822f06f4ac68ea8b..43ad2a1847a235137bf015f0dc843404ffc7e178 100644 --- a/app/views/admin/research/journal/volumes/static.html.erb +++ b/app/views/admin/research/journal/volumes/static.html.erb @@ -5,7 +5,7 @@ number: <%= @about.number %> issn: "<%= @about.journal.issn %>" keywords: > <%= @about.keywords %> -date: <%= @about.published_at %> UTC +date: "<%= @about.published_at.iso8601 %>" <% if @about.featured_image.attached? %> image: "<%= @about.featured_image.blob.id %>" image_alt: "<%= @about.featured_image_alt %>"