diff --git a/app/models/communication/website/page.rb b/app/models/communication/website/page.rb index 726b1ad1cdc683dad34bab112fe7b730ea53c4f4..c13b0e29f2e73bbeafc0a0594f266a3014acab5c 100644 --- a/app/models/communication/website/page.rb +++ b/app/models/communication/website/page.rb @@ -76,7 +76,7 @@ class Communication::Website::Page < ApplicationRecord # Override from WithGithubFiles def github_path_generated - "_pages/#{path}/index.html".gsub('///', '/').gsub('//', '/') + "_pages/#{path}/index.html".gsub(/\/+/, '/') end def list_of_other_pages diff --git a/app/models/concerns/with_github_files.rb b/app/models/concerns/with_github_files.rb index 5277e84a718e363ba24a82407b759a518fa75e85..5da22da8afa66ff463a8997480e25ee2e1d83f61 100644 --- a/app/models/concerns/with_github_files.rb +++ b/app/models/concerns/with_github_files.rb @@ -14,7 +14,7 @@ module WithGithubFiles end def github_path_generated - "_#{self.class.name.demodulize.pluralize.underscore}/#{self.id}.md" + "_#{self.class.name.demodulize.pluralize.underscore}/#{self.id}.html" end def to_jekyll(github_file) diff --git a/app/models/research/journal.rb b/app/models/research/journal.rb index a8a986936ea21426518ee3051c49b19b38a5a776..f44d2707a6614b207b89f3a200973d1caf671baa 100644 --- a/app/models/research/journal.rb +++ b/app/models/research/journal.rb @@ -21,6 +21,8 @@ # fk_rails_... (university_id => universities.id) # class Research::Journal < ApplicationRecord + include WithGithubFiles + belongs_to :university has_many :websites, class_name: 'Communication::Website', as: :about has_many :volumes, foreign_key: :research_journal_id @@ -32,7 +34,8 @@ class Research::Journal < ApplicationRecord "#{title}" end - def github_path + def github_path_generated + # Override from WithGithubFiles "_data/journal.yml" end diff --git a/app/models/research/journal/article.rb b/app/models/research/journal/article.rb index 4c9e455171626598bb78340c0911d00a3d1e5dc5..bde49caaa5be0920e8d249c9210af88a6afa95b8 100644 --- a/app/models/research/journal/article.rb +++ b/app/models/research/journal/article.rb @@ -56,10 +56,6 @@ class Research::Journal::Article < ApplicationRecord "#{ title }" end - def github_path - "_articles/#{id}.html" - end - private def update_researchers diff --git a/app/models/research/journal/volume.rb b/app/models/research/journal/volume.rb index 276b08dfb6a0e1ae312532c89439a43b8699708e..676a48bfaac96e54bbb05d04ae32fb3bc1561892 100644 --- a/app/models/research/journal/volume.rb +++ b/app/models/research/journal/volume.rb @@ -46,9 +46,4 @@ class Research::Journal::Volume < ApplicationRecord def to_s "##{ number } #{ title }" end - - def github_path - "_volumes/#{id}.html" - end - end diff --git a/app/models/research/researcher.rb b/app/models/research/researcher.rb index 49b6ca04b3abca0ee4118e868bf90871ee34c40f..f80d439bf07f29d519bf72cddbdc7257a658bd10 100644 --- a/app/models/research/researcher.rb +++ b/app/models/research/researcher.rb @@ -37,7 +37,8 @@ class Research::Researcher < ApplicationRecord "#{ first_name } #{ last_name }" end - def github_path + def github_path_generated + # Override from WithGithubFiles "_authors/#{self.id}.md" end end