From bc0a00a80df72fbbbd7858be6f77309def6d45a4 Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Mon, 9 Jan 2023 15:09:39 +0100
Subject: [PATCH] add summary to research papers
---
app/controllers/admin/research/journals/papers_controller.rb | 2 +-
app/models/research/journal/paper.rb | 1 +
app/views/admin/research/journals/papers/_form.html.erb | 1 +
app/views/admin/research/journals/papers/show.html.erb | 1 +
app/views/admin/research/journals/papers/static.html.erb | 2 +-
config/locales/research/en.yml | 1 +
config/locales/research/fr.yml | 1 +
db/migrate/20230109140347_add_summary_to_research_papers.rb | 5 +++++
db/schema.rb | 3 ++-
9 files changed, 14 insertions(+), 3 deletions(-)
create mode 100644 db/migrate/20230109140347_add_summary_to_research_papers.rb
diff --git a/app/controllers/admin/research/journals/papers_controller.rb b/app/controllers/admin/research/journals/papers_controller.rb
index 205c59c45..91d6ae4a1 100644
--- a/app/controllers/admin/research/journals/papers_controller.rb
+++ b/app/controllers/admin/research/journals/papers_controller.rb
@@ -60,7 +60,7 @@ class Admin::Research::Journals::PapersController < Admin::Research::Journals::A
def paper_params
params.require(:research_journal_paper)
- .permit(:title, :slug, :text, :published, :published_at, :abstract, :description, :pdf, :references, :keywords, :research_journal_volume_id, person_ids: [])
+ .permit(:title, :slug, :text, :published, :published_at, :summary, :abstract, :description, :pdf, :references, :keywords, :research_journal_volume_id, person_ids: [])
.merge(university_id: current_university.id)
end
end
diff --git a/app/models/research/journal/paper.rb b/app/models/research/journal/paper.rb
index d257f16a5..b573dcd1d 100644
--- a/app/models/research/journal/paper.rb
+++ b/app/models/research/journal/paper.rb
@@ -11,6 +11,7 @@
# published_at :datetime
# references :text
# slug :string
+# summary :text
# text :text
# title :string
# created_at :datetime not null
diff --git a/app/views/admin/research/journals/papers/_form.html.erb b/app/views/admin/research/journals/papers/_form.html.erb
index f3e6cc44a..dea53a6c4 100644
--- a/app/views/admin/research/journals/papers/_form.html.erb
+++ b/app/views/admin/research/journals/papers/_form.html.erb
@@ -10,6 +10,7 @@
</div>
<div class="card-body">
<%= f.input :title, as: :text, input_html: { rows: 3 } %>
+ <%= render 'admin/application/summary/form', f: f, about: paper %>
<%= f.input :abstract, as: :text, input_html: { rows: 8 } %>
<%= f.input :pdf %>
<%= f.input :text, as: :summernote %>
diff --git a/app/views/admin/research/journals/papers/show.html.erb b/app/views/admin/research/journals/papers/show.html.erb
index 8abc2ab2f..29fd35332 100644
--- a/app/views/admin/research/journals/papers/show.html.erb
+++ b/app/views/admin/research/journals/papers/show.html.erb
@@ -19,6 +19,7 @@
<p><%= @paper.references %></p>
</div>
</div>
+ <%= render 'admin/application/summary/show', about: @paper %>
</div>
<div class="col-md-4">
<div class="card flex-fill w-100">
diff --git a/app/views/admin/research/journals/papers/static.html.erb b/app/views/admin/research/journals/papers/static.html.erb
index e59d272ad..8b0c77f29 100644
--- a/app/views/admin/research/journals/papers/static.html.erb
+++ b/app/views/admin/research/journals/papers/static.html.erb
@@ -18,7 +18,7 @@ researchers:
<% @about.people.each do |person| %>
- "<%= person.slug %>"
<% end %>
-description_short: "<%= @about.abstract %>"
+<%= render 'admin/application/summary/static' %>
abstract: "<%= @about.abstract %>"
references: "<%= @about.references %>"
---
diff --git a/config/locales/research/en.yml b/config/locales/research/en.yml
index 09f9bc071..bd9b94dcc 100644
--- a/config/locales/research/en.yml
+++ b/config/locales/research/en.yml
@@ -35,6 +35,7 @@ en:
published_at: Published at
references: References
people: Authors
+ summary: Summary
text: Text
title: Title
research/journal/volume:
diff --git a/config/locales/research/fr.yml b/config/locales/research/fr.yml
index 1dc6d8e66..d713e4acb 100644
--- a/config/locales/research/fr.yml
+++ b/config/locales/research/fr.yml
@@ -35,6 +35,7 @@ fr:
published_at: Publié le
references: Références
people: Auteu·rs·rices
+ summary: Résumé
text: Texte
title: Titre
research/journal/volume:
diff --git a/db/migrate/20230109140347_add_summary_to_research_papers.rb b/db/migrate/20230109140347_add_summary_to_research_papers.rb
new file mode 100644
index 000000000..19141adc0
--- /dev/null
+++ b/db/migrate/20230109140347_add_summary_to_research_papers.rb
@@ -0,0 +1,5 @@
+class AddSummaryToResearchPapers < ActiveRecord::Migration[7.0]
+ def change
+ add_column :research_journal_papers, :summary, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index abc4d3959..0199ee059 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[7.0].define(version: 2023_01_09_132016) do
+ActiveRecord::Schema[7.0].define(version: 2023_01_09_140347) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
enable_extension "plpgsql"
@@ -581,6 +581,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_01_09_132016) do
t.integer "position"
t.text "text"
t.text "description"
+ t.text "summary"
t.index ["research_journal_id"], name: "index_research_journal_papers_on_research_journal_id"
t.index ["research_journal_volume_id"], name: "index_research_journal_papers_on_research_journal_volume_id"
t.index ["university_id"], name: "index_research_journal_papers_on_university_id"
--
GitLab