From 88e15215652d305c3d8ca2fc4b179dce9b79638f Mon Sep 17 00:00:00 2001
From: Arnaud Levy <contact@arnaudlevy.com>
Date: Tue, 10 May 2022 07:03:19 +0200
Subject: [PATCH] research
---
.../{journal => journals}/application_controller.rb | 2 +-
.../research/{journal => journals}/articles_controller.rb | 2 +-
.../research/{journal => journals}/volumes_controller.rb | 2 +-
.../{laboratory => laboratories}/application_controller.rb | 2 +-
.../{laboratory => laboratories}/axes_controller.rb | 2 +-
.../research/{journal => journals}/articles/_form.html.erb | 0
.../research/{journal => journals}/articles/_list.html.erb | 0
.../research/{journal => journals}/articles/edit.html.erb | 0
.../research/{journal => journals}/articles/index.html.erb | 2 +-
.../research/{journal => journals}/articles/new.html.erb | 0
.../research/{journal => journals}/articles/show.html.erb | 0
.../research/{journal => journals}/articles/static.html.erb | 0
app/views/admin/research/journals/show.html.erb | 2 +-
.../research/{journal => journals}/volumes/_form.html.erb | 0
.../research/{journal => journals}/volumes/edit.html.erb | 0
.../research/{journal => journals}/volumes/index.html.erb | 0
.../research/{journal => journals}/volumes/new.html.erb | 0
.../research/{journal => journals}/volumes/show.html.erb | 0
.../research/{journal => journals}/volumes/static.html.erb | 0
.../{laboratory => laboratories}/axes/_form.html.erb | 0
.../{laboratory => laboratories}/axes/_list.html.erb | 0
.../{laboratory => laboratories}/axes/edit.html.erb | 0
.../{laboratory => laboratories}/axes/index.html.erb | 2 +-
.../research/{laboratory => laboratories}/axes/new.html.erb | 0
.../{laboratory => laboratories}/axes/show.html.erb | 0
app/views/admin/research/laboratories/show.html.erb | 2 +-
app/views/admin/research/researchers/show.html.erb | 2 +-
config/routes/admin/research.rb | 6 +++---
28 files changed, 13 insertions(+), 13 deletions(-)
rename app/controllers/admin/research/{journal => journals}/application_controller.rb (79%)
rename app/controllers/admin/research/{journal => journals}/articles_controller.rb (94%)
rename app/controllers/admin/research/{journal => journals}/volumes_controller.rb (94%)
rename app/controllers/admin/research/{laboratory => laboratories}/application_controller.rb (79%)
rename app/controllers/admin/research/{laboratory => laboratories}/axes_controller.rb (92%)
rename app/views/admin/research/{journal => journals}/articles/_form.html.erb (100%)
rename app/views/admin/research/{journal => journals}/articles/_list.html.erb (100%)
rename app/views/admin/research/{journal => journals}/articles/edit.html.erb (100%)
rename app/views/admin/research/{journal => journals}/articles/index.html.erb (70%)
rename app/views/admin/research/{journal => journals}/articles/new.html.erb (100%)
rename app/views/admin/research/{journal => journals}/articles/show.html.erb (100%)
rename app/views/admin/research/{journal => journals}/articles/static.html.erb (100%)
rename app/views/admin/research/{journal => journals}/volumes/_form.html.erb (100%)
rename app/views/admin/research/{journal => journals}/volumes/edit.html.erb (100%)
rename app/views/admin/research/{journal => journals}/volumes/index.html.erb (100%)
rename app/views/admin/research/{journal => journals}/volumes/new.html.erb (100%)
rename app/views/admin/research/{journal => journals}/volumes/show.html.erb (100%)
rename app/views/admin/research/{journal => journals}/volumes/static.html.erb (100%)
rename app/views/admin/research/{laboratory => laboratories}/axes/_form.html.erb (100%)
rename app/views/admin/research/{laboratory => laboratories}/axes/_list.html.erb (100%)
rename app/views/admin/research/{laboratory => laboratories}/axes/edit.html.erb (100%)
rename app/views/admin/research/{laboratory => laboratories}/axes/index.html.erb (72%)
rename app/views/admin/research/{laboratory => laboratories}/axes/new.html.erb (100%)
rename app/views/admin/research/{laboratory => laboratories}/axes/show.html.erb (100%)
diff --git a/app/controllers/admin/research/journal/application_controller.rb b/app/controllers/admin/research/journals/application_controller.rb
similarity index 79%
rename from app/controllers/admin/research/journal/application_controller.rb
rename to app/controllers/admin/research/journals/application_controller.rb
index 85da4184f..61b13d5ee 100644
--- a/app/controllers/admin/research/journal/application_controller.rb
+++ b/app/controllers/admin/research/journals/application_controller.rb
@@ -1,4 +1,4 @@
-class Admin::Research::Journal::ApplicationController < Admin::Research::ApplicationController
+class Admin::Research::Journals::ApplicationController < Admin::Research::ApplicationController
load_and_authorize_resource :journal,
class: Research::Journal,
through: :current_university,
diff --git a/app/controllers/admin/research/journal/articles_controller.rb b/app/controllers/admin/research/journals/articles_controller.rb
similarity index 94%
rename from app/controllers/admin/research/journal/articles_controller.rb
rename to app/controllers/admin/research/journals/articles_controller.rb
index 986777174..50fe4b3bb 100644
--- a/app/controllers/admin/research/journal/articles_controller.rb
+++ b/app/controllers/admin/research/journals/articles_controller.rb
@@ -1,4 +1,4 @@
-class Admin::Research::Journal::ArticlesController < Admin::Research::Journal::ApplicationController
+class Admin::Research::Journals::ArticlesController < Admin::Research::Journals::ApplicationController
load_and_authorize_resource class: Research::Journal::Article, through: :journal
include Admin::Reorderable
diff --git a/app/controllers/admin/research/journal/volumes_controller.rb b/app/controllers/admin/research/journals/volumes_controller.rb
similarity index 94%
rename from app/controllers/admin/research/journal/volumes_controller.rb
rename to app/controllers/admin/research/journals/volumes_controller.rb
index 321de51ce..3805ef140 100644
--- a/app/controllers/admin/research/journal/volumes_controller.rb
+++ b/app/controllers/admin/research/journals/volumes_controller.rb
@@ -1,4 +1,4 @@
-class Admin::Research::Journal::VolumesController < Admin::Research::Journal::ApplicationController
+class Admin::Research::Journals::VolumesController < Admin::Research::Journals::ApplicationController
load_and_authorize_resource class: Research::Journal::Volume, through: :journal
def index
diff --git a/app/controllers/admin/research/laboratory/application_controller.rb b/app/controllers/admin/research/laboratories/application_controller.rb
similarity index 79%
rename from app/controllers/admin/research/laboratory/application_controller.rb
rename to app/controllers/admin/research/laboratories/application_controller.rb
index a43dc2d32..343066b58 100644
--- a/app/controllers/admin/research/laboratory/application_controller.rb
+++ b/app/controllers/admin/research/laboratories/application_controller.rb
@@ -1,4 +1,4 @@
-class Admin::Research::Laboratory::ApplicationController < Admin::Research::ApplicationController
+class Admin::Research::Laboratories::ApplicationController < Admin::Research::ApplicationController
load_and_authorize_resource :laboratory,
class: Research::Laboratory,
through: :current_university,
diff --git a/app/controllers/admin/research/laboratory/axes_controller.rb b/app/controllers/admin/research/laboratories/axes_controller.rb
similarity index 92%
rename from app/controllers/admin/research/laboratory/axes_controller.rb
rename to app/controllers/admin/research/laboratories/axes_controller.rb
index 293def8bc..5c672627a 100644
--- a/app/controllers/admin/research/laboratory/axes_controller.rb
+++ b/app/controllers/admin/research/laboratories/axes_controller.rb
@@ -1,4 +1,4 @@
-class Admin::Research::Laboratory::AxesController < Admin::Research::Laboratory::ApplicationController
+class Admin::Research::Laboratories::AxesController < Admin::Research::Laboratories::ApplicationController
load_and_authorize_resource class: Research::Laboratory::Axis, through: :laboratory
include Admin::Reorderable
diff --git a/app/views/admin/research/journal/articles/_form.html.erb b/app/views/admin/research/journals/articles/_form.html.erb
similarity index 100%
rename from app/views/admin/research/journal/articles/_form.html.erb
rename to app/views/admin/research/journals/articles/_form.html.erb
diff --git a/app/views/admin/research/journal/articles/_list.html.erb b/app/views/admin/research/journals/articles/_list.html.erb
similarity index 100%
rename from app/views/admin/research/journal/articles/_list.html.erb
rename to app/views/admin/research/journals/articles/_list.html.erb
diff --git a/app/views/admin/research/journal/articles/edit.html.erb b/app/views/admin/research/journals/articles/edit.html.erb
similarity index 100%
rename from app/views/admin/research/journal/articles/edit.html.erb
rename to app/views/admin/research/journals/articles/edit.html.erb
diff --git a/app/views/admin/research/journal/articles/index.html.erb b/app/views/admin/research/journals/articles/index.html.erb
similarity index 70%
rename from app/views/admin/research/journal/articles/index.html.erb
rename to app/views/admin/research/journals/articles/index.html.erb
index 00a03fe06..482b92c24 100644
--- a/app/views/admin/research/journal/articles/index.html.erb
+++ b/app/views/admin/research/journals/articles/index.html.erb
@@ -1,6 +1,6 @@
<% content_for :title, Research::Journal::Article.model_name.human(count: 2) %>
-<%= render 'admin/research/journal/articles/list', articles: @articles %>
+<%= render 'admin/research/journals/articles/list', articles: @articles %>
<% content_for :action_bar_right do %>
<%= create_link Research::Journal::Article %>
diff --git a/app/views/admin/research/journal/articles/new.html.erb b/app/views/admin/research/journals/articles/new.html.erb
similarity index 100%
rename from app/views/admin/research/journal/articles/new.html.erb
rename to app/views/admin/research/journals/articles/new.html.erb
diff --git a/app/views/admin/research/journal/articles/show.html.erb b/app/views/admin/research/journals/articles/show.html.erb
similarity index 100%
rename from app/views/admin/research/journal/articles/show.html.erb
rename to app/views/admin/research/journals/articles/show.html.erb
diff --git a/app/views/admin/research/journal/articles/static.html.erb b/app/views/admin/research/journals/articles/static.html.erb
similarity index 100%
rename from app/views/admin/research/journal/articles/static.html.erb
rename to app/views/admin/research/journals/articles/static.html.erb
diff --git a/app/views/admin/research/journals/show.html.erb b/app/views/admin/research/journals/show.html.erb
index 3243b7306..9a6d6f41e 100644
--- a/app/views/admin/research/journals/show.html.erb
+++ b/app/views/admin/research/journals/show.html.erb
@@ -52,7 +52,7 @@
<%= link_to Research::Journal::Article.model_name.human(count: 2),
admin_research_journal_articles_path(journal_id: @journal) %></h2>
</div>
- <%= render 'admin/research/journal/articles/list', articles: @articles %>
+ <%= render 'admin/research/journals/articles/list', articles: @articles %>
</div>
<% content_for :action_bar_left do %>
diff --git a/app/views/admin/research/journal/volumes/_form.html.erb b/app/views/admin/research/journals/volumes/_form.html.erb
similarity index 100%
rename from app/views/admin/research/journal/volumes/_form.html.erb
rename to app/views/admin/research/journals/volumes/_form.html.erb
diff --git a/app/views/admin/research/journal/volumes/edit.html.erb b/app/views/admin/research/journals/volumes/edit.html.erb
similarity index 100%
rename from app/views/admin/research/journal/volumes/edit.html.erb
rename to app/views/admin/research/journals/volumes/edit.html.erb
diff --git a/app/views/admin/research/journal/volumes/index.html.erb b/app/views/admin/research/journals/volumes/index.html.erb
similarity index 100%
rename from app/views/admin/research/journal/volumes/index.html.erb
rename to app/views/admin/research/journals/volumes/index.html.erb
diff --git a/app/views/admin/research/journal/volumes/new.html.erb b/app/views/admin/research/journals/volumes/new.html.erb
similarity index 100%
rename from app/views/admin/research/journal/volumes/new.html.erb
rename to app/views/admin/research/journals/volumes/new.html.erb
diff --git a/app/views/admin/research/journal/volumes/show.html.erb b/app/views/admin/research/journals/volumes/show.html.erb
similarity index 100%
rename from app/views/admin/research/journal/volumes/show.html.erb
rename to app/views/admin/research/journals/volumes/show.html.erb
diff --git a/app/views/admin/research/journal/volumes/static.html.erb b/app/views/admin/research/journals/volumes/static.html.erb
similarity index 100%
rename from app/views/admin/research/journal/volumes/static.html.erb
rename to app/views/admin/research/journals/volumes/static.html.erb
diff --git a/app/views/admin/research/laboratory/axes/_form.html.erb b/app/views/admin/research/laboratories/axes/_form.html.erb
similarity index 100%
rename from app/views/admin/research/laboratory/axes/_form.html.erb
rename to app/views/admin/research/laboratories/axes/_form.html.erb
diff --git a/app/views/admin/research/laboratory/axes/_list.html.erb b/app/views/admin/research/laboratories/axes/_list.html.erb
similarity index 100%
rename from app/views/admin/research/laboratory/axes/_list.html.erb
rename to app/views/admin/research/laboratories/axes/_list.html.erb
diff --git a/app/views/admin/research/laboratory/axes/edit.html.erb b/app/views/admin/research/laboratories/axes/edit.html.erb
similarity index 100%
rename from app/views/admin/research/laboratory/axes/edit.html.erb
rename to app/views/admin/research/laboratories/axes/edit.html.erb
diff --git a/app/views/admin/research/laboratory/axes/index.html.erb b/app/views/admin/research/laboratories/axes/index.html.erb
similarity index 72%
rename from app/views/admin/research/laboratory/axes/index.html.erb
rename to app/views/admin/research/laboratories/axes/index.html.erb
index dfe60dc90..a18ee5586 100644
--- a/app/views/admin/research/laboratory/axes/index.html.erb
+++ b/app/views/admin/research/laboratories/axes/index.html.erb
@@ -1,6 +1,6 @@
<% content_for :title, Research::Laboratory::Axis.model_name.human(count: 2) %>
-<%= render 'admin/research/laboratory/axes/list', axes: @axes %>
+<%= render 'admin/research/laboratories/axes/list', axes: @axes %>
<% content_for :action_bar_right do %>
<%= create_link Research::Laboratory::Axis %>
diff --git a/app/views/admin/research/laboratory/axes/new.html.erb b/app/views/admin/research/laboratories/axes/new.html.erb
similarity index 100%
rename from app/views/admin/research/laboratory/axes/new.html.erb
rename to app/views/admin/research/laboratories/axes/new.html.erb
diff --git a/app/views/admin/research/laboratory/axes/show.html.erb b/app/views/admin/research/laboratories/axes/show.html.erb
similarity index 100%
rename from app/views/admin/research/laboratory/axes/show.html.erb
rename to app/views/admin/research/laboratories/axes/show.html.erb
diff --git a/app/views/admin/research/laboratories/show.html.erb b/app/views/admin/research/laboratories/show.html.erb
index 38b6adcc7..e9f522a01 100644
--- a/app/views/admin/research/laboratories/show.html.erb
+++ b/app/views/admin/research/laboratories/show.html.erb
@@ -11,7 +11,7 @@
<%= link_to Research::Laboratory::Axis.model_name.human(count: 2),
admin_research_laboratory_axes_path(laboratory_id: @laboratory) %></h2>
</div>
- <%= render 'admin/research/laboratory/axes/list', axes: @axes %>
+ <%= render 'admin/research/laboratories/axes/list', axes: @axes %>
</div>
<% content_for :action_bar_left do %>
diff --git a/app/views/admin/research/researchers/show.html.erb b/app/views/admin/research/researchers/show.html.erb
index b80329a3c..6b521d61f 100644
--- a/app/views/admin/research/researchers/show.html.erb
+++ b/app/views/admin/research/researchers/show.html.erb
@@ -7,7 +7,7 @@
<div class="card-header">
<h2 class="card-title mb-0 h5"><%= "#{Research::Journal::Article.model_name.human(count: 2)} (#{@articles.total_count})" %></h2>
</div>
- <%= render 'admin/research/journal/articles/list', articles: @articles %>
+ <%= render 'admin/research/journals/articles/list', articles: @articles %>
<% if @articles.total_pages > 1 %>
<div class="card-footer">
<%= paginate @articles, theme: 'bootstrap-5' %>
diff --git a/config/routes/admin/research.rb b/config/routes/admin/research.rb
index 3557586e7..d4ec9725c 100644
--- a/config/routes/admin/research.rb
+++ b/config/routes/admin/research.rb
@@ -1,15 +1,15 @@
namespace :research do
resources :researchers, only: [:index, :show]
resources :journals do
- resources :volumes, controller: 'journal/volumes'
- resources :articles, controller: 'journal/articles' do
+ resources :volumes, controller: 'journals/volumes'
+ resources :articles, controller: 'journals/articles' do
collection do
post :reorder
end
end
end
resources :laboratories do
- resources :axes, controller: 'laboratory/axes' do
+ resources :axes, controller: 'laboratories/axes' do
collection do
post :reorder
end
--
GitLab