From 4813f9a2a5c2a63ff576607300e997c4b6777548 Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Wed, 8 Sep 2021 11:52:27 +0200
Subject: [PATCH] wip
---
.../admin/research/journal/articles_controller.rb | 2 +-
app/models/research/journal/article.rb | 2 ++
app/views/admin/research/journal/articles/_form.html.erb | 6 ++++--
app/views/admin/research/journal/articles/jekyll.html.erb | 4 +++-
app/views/admin/research/journal/articles/show.html.erb | 2 +-
..._abstract_and_references_to_research_journal_articles.rb | 6 ++++++
db/schema.rb | 4 +++-
test/fixtures/research/journal/articles.yml | 2 ++
test/models/research/journal/article_test.rb | 2 ++
9 files changed, 24 insertions(+), 6 deletions(-)
create mode 100644 db/migrate/20210908094427_add_abstract_and_references_to_research_journal_articles.rb
diff --git a/app/controllers/admin/research/journal/articles_controller.rb b/app/controllers/admin/research/journal/articles_controller.rb
index 9db0bdb8d..51cc02d2e 100644
--- a/app/controllers/admin/research/journal/articles_controller.rb
+++ b/app/controllers/admin/research/journal/articles_controller.rb
@@ -56,6 +56,6 @@ class Admin::Research::Journal::ArticlesController < Admin::Research::Journal::A
end
def article_params
- params.require(:research_journal_article).permit(:title, :text, :published_at, :research_journal_volume_id, researcher_ids: [])
+ params.require(:research_journal_article).permit(:title, :text, :published_at, :abstract, :references, :research_journal_volume_id, researcher_ids: [])
end
end
diff --git a/app/models/research/journal/article.rb b/app/models/research/journal/article.rb
index 5ed69141c..f3627ed76 100644
--- a/app/models/research/journal/article.rb
+++ b/app/models/research/journal/article.rb
@@ -3,7 +3,9 @@
# Table name: research_journal_articles
#
# id :uuid not null, primary key
+# abstract :text
# published_at :date
+# references :text
# text :text
# title :string
# created_at :datetime not null
diff --git a/app/views/admin/research/journal/articles/_form.html.erb b/app/views/admin/research/journal/articles/_form.html.erb
index e471857e1..92e78c5ed 100644
--- a/app/views/admin/research/journal/articles/_form.html.erb
+++ b/app/views/admin/research/journal/articles/_form.html.erb
@@ -1,13 +1,15 @@
<%= simple_form_for [:admin, article] do |f| %>
<div class="row">
<div class="col-md-4">
- <%= f.input :title %>
+ <%= f.input :title, as: :text, input_html: { rows: 3 } %>
<%= f.association :volume, collection: @journal.volumes %>
<%= f.input :published_at, html5: true %>
<%= f.association :researchers %>
</div>
<div class="col-md-8">
- <%= f.input :text, input_html: { rows: 30 } %>
+ <%= f.input :abstract, as: :text, input_html: { rows: 6 } %>
+ <%= f.input :text, input_html: { rows: 20 } %>
+ <%= f.input :references, as: :text, input_html: { rows: 10 } %>
</div>
</div>
<% content_for :buttons do %>
diff --git a/app/views/admin/research/journal/articles/jekyll.html.erb b/app/views/admin/research/journal/articles/jekyll.html.erb
index a1a769321..084ca62a9 100644
--- a/app/views/admin/research/journal/articles/jekyll.html.erb
+++ b/app/views/admin/research/journal/articles/jekyll.html.erb
@@ -2,7 +2,9 @@
title: "<%= @article.title %>"
volume: "<%= @article.volume.id %>"
publication: "<%= @article.published_at %>"
-description: ""
+abstract: "<%= @article.abstract %>"
+description: "<%= @article.abstract %>"
+references: "<%= @article.references %>"
authors:
<% @article.researchers.each do |researcher| %>
- "<%= researcher.id %>"
diff --git a/app/views/admin/research/journal/articles/show.html.erb b/app/views/admin/research/journal/articles/show.html.erb
index aec520be1..72a6417a3 100644
--- a/app/views/admin/research/journal/articles/show.html.erb
+++ b/app/views/admin/research/journal/articles/show.html.erb
@@ -14,7 +14,7 @@
</ul>
</p>
-<%= @article.text %>
+<%= @article.abstract %>
<% content_for :buttons do %>
<%= edit_link @article %>
diff --git a/db/migrate/20210908094427_add_abstract_and_references_to_research_journal_articles.rb b/db/migrate/20210908094427_add_abstract_and_references_to_research_journal_articles.rb
new file mode 100644
index 000000000..97cb73e61
--- /dev/null
+++ b/db/migrate/20210908094427_add_abstract_and_references_to_research_journal_articles.rb
@@ -0,0 +1,6 @@
+class AddAbstractAndReferencesToResearchJournalArticles < ActiveRecord::Migration[6.1]
+ def change
+ add_column :research_journal_articles, :abstract, :text
+ add_column :research_journal_articles, :references, :text
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d2bf788cf..89830e39f 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.define(version: 2021_09_07_162252) do
+ActiveRecord::Schema.define(version: 2021_09_08_094427) do
# These are extensions that must be enabled in order to support this database
enable_extension "pgcrypto"
@@ -103,6 +103,8 @@ ActiveRecord::Schema.define(version: 2021_09_07_162252) do
t.datetime "created_at", precision: 6, null: false
t.date "updated_at", null: false
t.uuid "updated_by_id"
+ t.text "abstract"
+ t.text "references"
t.index ["research_journal_id"], name: "index_research_journal_articles_on_research_journal_id"
t.index ["research_journal_volume_id"], name: "index_research_journal_articles_on_research_journal_volume_id"
t.index ["university_id"], name: "index_research_journal_articles_on_university_id"
diff --git a/test/fixtures/research/journal/articles.yml b/test/fixtures/research/journal/articles.yml
index e5212c680..11c00dd45 100644
--- a/test/fixtures/research/journal/articles.yml
+++ b/test/fixtures/research/journal/articles.yml
@@ -3,7 +3,9 @@
# Table name: research_journal_articles
#
# id :uuid not null, primary key
+# abstract :text
# published_at :date
+# references :text
# text :text
# title :string
# created_at :datetime not null
diff --git a/test/models/research/journal/article_test.rb b/test/models/research/journal/article_test.rb
index efa6c283a..6582f865d 100644
--- a/test/models/research/journal/article_test.rb
+++ b/test/models/research/journal/article_test.rb
@@ -3,7 +3,9 @@
# Table name: research_journal_articles
#
# id :uuid not null, primary key
+# abstract :text
# published_at :date
+# references :text
# text :text
# title :string
# created_at :datetime not null
--
GitLab