Merge branch 'git' of github.com:noesya/osuny into git

app/models/communication/website/category.rb

@@ -89,6 +89,10 @@ class Communication::Website::Category < ApplicationRecord
     end
   end
 
+  def siblings
+    self.class.unscoped.where(parent: parent, university: university, website: website).where.not(id: id)
+  end
+
   protected
 
   def set_position

app/models/communication/website/home.rb

@@ -37,4 +37,9 @@ class Communication::Website::Home < ApplicationRecord
   def git_path_static
     'content/_index.html'
   end
+
+  def git_dependencies_static
+    active_storage_blobs
+  end
+
 end

app/models/communication/website/menu/item.rb

@@ -119,6 +119,10 @@ class Communication::Website::Menu::Item < ApplicationRecord
     menu.sync_with_git
   end
 
+  def siblings
+    self.class.unscoped.where(parent: parent, university: university, website: website).where.not(id: id)
+  end
+
   protected
 
   def set_position

app/models/communication/website/page.rb

@@ -76,7 +76,7 @@ class Communication::Website::Page < ApplicationRecord
   end
 
   def git_dependencies_static
-    descendents + siblings
+    descendents + siblings + active_storage_blobs
   end
 
   def to_s
@@ -97,6 +97,10 @@ class Communication::Website::Page < ApplicationRecord
     end
   end
 
+  def siblings
+    self.class.unscoped.where(parent: parent, university: university, website: website).where.not(id: id)
+  end
+
   protected
 
   def slug_unavailable?(slug)

app/models/communication/website/post.rb

@@ -72,7 +72,7 @@ class Communication::Website::Post < ApplicationRecord
   end
 
   def git_dependencies_static
-    [author] + categories
+    [author] + categories + active_storage_blobs
   end
 
   def to_s

app/models/concerns/with_tree.rb

@@ -24,7 +24,7 @@ module WithTree
     end
 
     def siblings
-      self.class.where(parent: parent, university: university, website: website).where.not(id: id)
+      self.class.unscoped.where(parent: parent, university: university).where.not(id: id)
     end
 
     def self_and_children(level)

app/models/education/program.rb

@@ -111,6 +111,10 @@ class Education::Program < ApplicationRecord
     "content/programs/#{path}/_index.html".gsub(/\/+/, '/')
   end
 
+  def git_dependencies_static
+    active_storage_blobs
+  end
+
   def update_children_paths
     children.each do |child|
       child.update_column :path, child.generated_path

config/initializers/active_storage.rb

@@ -32,3 +32,13 @@ ActiveStorage::Filename.class_eval do
     [base_filename, extension_with_delimiter].join('')
   end
 end
+
+module ActiveStorageGitPathStatic
+  def git_path_static
+    "data/media/#{id[0..1]}/#{id}.yml"
+  end
+end
+
+ActiveSupport::Reloader.to_prepare do
+  ActiveStorage::Blob.include ActiveStorageGitPathStatic
+end