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 85da4184f6c544f3af365d7a2162ecba01a68d12..61b13d5ee541230c769006cccbc318c7ace1ab20 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 986777174ed261094f1ebd24ce558936ff100602..50fe4b3bbd71492cd8bb4447fe4370eb26da8714 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 321de51ce7970433d87913b95f1dcafe23114192..3805ef140a1b67b35a494d34e666739483270c19 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 a43dc2d32f33bd9a68f99c258ee09b3d7830bcb0..343066b58ef9d47431ee5b74d56f9ceadc4e72fc 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 293def8bcfd4b36df1985fd6a65d495e0a8aaf84..5c672627a7cf8ea7e19a15b3adaf0aed281ccccb 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 00a03fe0682e74b3c311b46a16fb9fe0b8b15ba4..482b92c24acabe62a91b96fc21ae2d040be2a330 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 3243b7306446b04e956cd2440acfd7fa4cc47544..9a6d6f41ed25c56a7a2aa5d02695b2da0c567301 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 dfe60dc90513a75553c2ee3b201d0eabbfe65b02..a18ee558643a11bb8ea0647a31b9c04174f67345 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 38b6adcc77b32a3b00f22f3ffa72c71dd03d0e96..e9f522a018cd2b13b2c5a74691d91f2278cec996 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 b80329a3cb053d38a15ec7de48b35df54c16a9c3..6b521d61fdfba8b71ffb21016e960ddfad32cb11 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 3557586e7b881e7472eedcdbf1ba1ecd461bc3fc..d4ec9725ca5ab7f5d396d564f5b7fd26a473e076 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