diff --git a/app/models/research/journal/article.rb b/app/models/research/journal/article.rb index bcdb5bba8760adb126334f709f4075718098a6bc..20a415c655deaf08befa1c4a77cf15c2faa94b1f 100644 --- a/app/models/research/journal/article.rb +++ b/app/models/research/journal/article.rb @@ -37,7 +37,7 @@ class Research::Journal::Article < ApplicationRecord belongs_to :updated_by, class_name: 'User' has_and_belongs_to_many :researchers, class_name: 'Research::Researcher' - after_save :publish_to_github + after_commit :publish_to_github has_one_attached :pdf diff --git a/app/models/research/journal/volume.rb b/app/models/research/journal/volume.rb index b8521454eed345c158089404b5293ba9c2782cb5..86e614af0bd4b353689968fb0b3a9ffe9c159fe1 100644 --- a/app/models/research/journal/volume.rb +++ b/app/models/research/journal/volume.rb @@ -28,7 +28,7 @@ class Research::Journal::Volume < ApplicationRecord belongs_to :journal, foreign_key: :research_journal_id has_many :articles, foreign_key: :research_journal_volume_id - after_save :publish_to_github + after_commit :publish_to_github has_one_attached :cover diff --git a/app/views/admin/research/journal/articles/show.html.erb b/app/views/admin/research/journal/articles/show.html.erb index 6814e480fca98ca82bc9c5445deb3a5526d08bfc..e143915f9a51588fcfae00a8b3dd3c8b8b4a6e94 100644 --- a/app/views/admin/research/journal/articles/show.html.erb +++ b/app/views/admin/research/journal/articles/show.html.erb @@ -26,12 +26,12 @@ <h5 class="card-title mb-0">Metadata</h5> </div> <div class="card-body"> - <h3 class="h5"><%= Research::Journal::Article.human_attribute_name('published_at') %></h3> + <h3 class="h5"><%= Research::Journal::Article.human_attribute_name('volume') %></h3> + <%= link_to @article.volume, [:admin, @article.volume] if @article.volume %> + <h3 class="h5 mt-4"><%= Research::Journal::Article.human_attribute_name('published_at') %></h3> <p><%= @article.published_at&.to_date %></p> - <% if @article.volume %> - <h3 class="h5 mt-4"><%= Research::Journal::Article.human_attribute_name('researchers') %></h3> - <%= link_to @article.volume, [:admin, @article.volume] %> - <% end %> + <h3 class="h5 mt-4"><%= Research::Journal::Article.human_attribute_name('keywords') %></h3> + <p><%= @article.keywords %></p> <h3 class="h5 mt-4"><%= Research::Journal::Article.human_attribute_name('researchers') %></h3> <ul class="list-unstyled"> <% @article.researchers.each do |researcher| %>