From 0f79f4d612e2f8434f186e659b61315e16780fe6 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Fri, 13 Aug 2021 12:09:54 +0200
Subject: [PATCH] front
---
.../journal/volumes/_research_journal_volume.json.jbuilder | 2 --
app/views/research/journal/volumes/_volume.html.erb | 2 +-
app/views/research/journal/volumes/_volume.json.jbuilder | 2 ++
app/views/research/journal/volumes/index.html.erb | 2 +-
app/views/research/journal/volumes/show.json.jbuilder | 2 +-
app/views/research/journals/_journal.json.jbuilder | 6 ------
app/views/research/journals/index.html.erb | 2 +-
app/views/research/journals/show.html.erb | 2 +-
app/views/research/journals/show.json.jbuilder | 2 +-
9 files changed, 8 insertions(+), 14 deletions(-)
delete mode 100644 app/views/research/journal/volumes/_research_journal_volume.json.jbuilder
create mode 100644 app/views/research/journal/volumes/_volume.json.jbuilder
delete mode 100644 app/views/research/journals/_journal.json.jbuilder
diff --git a/app/views/research/journal/volumes/_research_journal_volume.json.jbuilder b/app/views/research/journal/volumes/_research_journal_volume.json.jbuilder
deleted file mode 100644
index 535d4a189..000000000
--- a/app/views/research/journal/volumes/_research_journal_volume.json.jbuilder
+++ /dev/null
@@ -1,2 +0,0 @@
-json.extract! research_journal_volume, :id, :title, :number, :published_at, :created_at, :updated_at
-json.url research_journal_volume_url(research_journal_volume, format: :json)
diff --git a/app/views/research/journal/volumes/_volume.html.erb b/app/views/research/journal/volumes/_volume.html.erb
index a52112617..dccb276fb 100644
--- a/app/views/research/journal/volumes/_volume.html.erb
+++ b/app/views/research/journal/volumes/_volume.html.erb
@@ -2,7 +2,7 @@
<div class="card-body">
<h1 class="h4">
<%= link_to volume,
- research_journal_volume_path(journal_id: journal, id: volume),
+ research_journal_volume_path(journal_id: volume.journal, id: volume),
class: 'stretched-link' %>
</h1>
</div>
diff --git a/app/views/research/journal/volumes/_volume.json.jbuilder b/app/views/research/journal/volumes/_volume.json.jbuilder
new file mode 100644
index 000000000..e53ca1692
--- /dev/null
+++ b/app/views/research/journal/volumes/_volume.json.jbuilder
@@ -0,0 +1,2 @@
+json.extract! volume, :id, :title, :number, :published_at, :created_at, :updated_at
+json.url research_journal_volume_url(journal: volume.journal, id: volume, format: :json)
diff --git a/app/views/research/journal/volumes/index.html.erb b/app/views/research/journal/volumes/index.html.erb
index 7c29510cd..47fdd6703 100644
--- a/app/views/research/journal/volumes/index.html.erb
+++ b/app/views/research/journal/volumes/index.html.erb
@@ -3,7 +3,7 @@
<div class="row">
<% @journal.volumes.each do |volume| %>
<div class="col-md-3">
- <%= render volume, journal: @journal %>
+ <%= render volume %>
</div>
<% end %>
</div>
diff --git a/app/views/research/journal/volumes/show.json.jbuilder b/app/views/research/journal/volumes/show.json.jbuilder
index 5ce421e45..5795a060c 100644
--- a/app/views/research/journal/volumes/show.json.jbuilder
+++ b/app/views/research/journal/volumes/show.json.jbuilder
@@ -1 +1 @@
-json.partial! "research_journal_volumes/research_journal_volume", research_journal_volume: @research_journal_volume
+json.partial! "research/journal/volumes/volume", volume: @volume
diff --git a/app/views/research/journals/_journal.json.jbuilder b/app/views/research/journals/_journal.json.jbuilder
deleted file mode 100644
index e0145a24d..000000000
--- a/app/views/research/journals/_journal.json.jbuilder
+++ /dev/null
@@ -1,6 +0,0 @@
-json.extract! journal, :id, :title, :description
-json.url research_journal_url(journal, format: :json)
-json.volumes journal.volumes do |volume|
- json.extract! volume, :id, :title, :published_at
- json.url research_journal_volume_url(journal_id: journal, id: volume, format: :json)
-end
diff --git a/app/views/research/journals/index.html.erb b/app/views/research/journals/index.html.erb
index b6ccc1d40..48478c237 100644
--- a/app/views/research/journals/index.html.erb
+++ b/app/views/research/journals/index.html.erb
@@ -10,7 +10,7 @@
<%= link_to 'Lire', journal, class: 'btn btn-primary stretched-link' %>
</div>
<div class="offset-md-1 col-md-3">
- <%= render journal.volumes.first, journal: journal if journal.volumes.any? %>
+ <%= render journal.volumes.first if journal.volumes.any? %>
</div>
</div>
<% end %>
diff --git a/app/views/research/journals/show.html.erb b/app/views/research/journals/show.html.erb
index ec810e918..2c6f746f4 100644
--- a/app/views/research/journals/show.html.erb
+++ b/app/views/research/journals/show.html.erb
@@ -10,7 +10,7 @@
<div class="row">
<% @journal.volumes.each do |volume| %>
<div class="col-md-3">
- <%= render volume, journal: @journal %>
+ <%= render volume %>
</div>
<% end %>
</div>
diff --git a/app/views/research/journals/show.json.jbuilder b/app/views/research/journals/show.json.jbuilder
index 90c860bf4..a43070ca7 100644
--- a/app/views/research/journals/show.json.jbuilder
+++ b/app/views/research/journals/show.json.jbuilder
@@ -2,5 +2,5 @@ json.extract! @journal, :id, :title, :description
json.url research_journal_url(@journal, format: :json)
json.volumes @journal.volumes do |volume|
json.extract! volume, :id, :title, :published_at
- json.url research_journal_volume_url(journal_id: @journal, id: volume, format: :json)
+ json.url research_journal_volume_url(journal_id: volume.journal, id: volume, format: :json)
end
--
GitLab