diff --git a/app/controllers/moderation/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb similarity index 80% rename from app/controllers/moderation/organizations_controller.rb rename to app/controllers/admin/organizations_controller.rb index 1528d0ea2..6f88f8d90 100644 --- a/app/controllers/moderation/organizations_controller.rb +++ b/app/controllers/admin/organizations_controller.rb @@ -1,4 +1,4 @@ -class Moderation::OrganizationsController < Moderation::BaseController +class Admin::OrganizationsController < Admin::BaseController load_and_authorize_resource diff --git a/app/views/admin/organizations/index.html.erb b/app/views/admin/organizations/index.html.erb new file mode 100644 index 000000000..d09f810d5 --- /dev/null +++ b/app/views/admin/organizations/index.html.erb @@ -0,0 +1,34 @@ +
+ +

<%= t('admin.organizations.index.title') %>

+ + + <% @organizations.each do |organization| %> + + + + + <% if organization.verified? %> + + <% end %> + <% if can? :verify, organization %> + + <% end %> + <% if organization.rejected? %> + + <% end %> + <% if can? :reject, organization %> + + <% end %> + + <% end %> +
<%= organization.name %><%= organization.email %><%= organization.phone_number %><%= t('admin.organizations.index.verified') %><%= link_to t('admin.organizations.index.verify'), + verify_admin_organization_path(organization), + method: :put + %> + <%= t('admin.organizations.index.rejected') %><%= link_to t('admin.organizations.index.reject'), + reject_admin_organization_path(organization), + method: :put + %> +
+
diff --git a/app/views/moderation/organizations/index.html.erb b/app/views/moderation/organizations/index.html.erb deleted file mode 100644 index 06549a9b3..000000000 --- a/app/views/moderation/organizations/index.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -

<%= t('moderation.organizations.index.title') %>

- - - <% @organizations.each do |organization| %> - - - - - <% if organization.verified? %> - - <% end %> - <% if can? :verify, organization %> - - <% end %> - <% if organization.rejected? %> - - <% end %> - <% if can? :reject, organization %> - - <% end %> - -<% end %> -
<%= organization.name %><%= organization.email %><%= organization.phone_number %><%= t('moderation.organizations.index.verified') %><%= link_to t('moderation.organizations.index.verify'), - verify_moderation_organization_path(organization), - method: :put - %> - <%= t('moderation.organizations.index.rejected') %><%= link_to t('moderation.organizations.index.reject'), - reject_moderation_organization_path(organization), - method: :put - %> -
diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index a5b469e1b..50f59cb81 100644 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -11,3 +11,10 @@ en: name: placeholder: 'Write a topic' destroy: Delete Tag + organizations: + index: + title: Organizations + verify: Verify + reject: Reject + verified: Verified + rejected: Rejected diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index fecb7c5f4..74290ce6c 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -3,6 +3,17 @@ es: dashboard: index: title: Administración + organizations: + index: + title: Organizaciones + verify: Verificar + reject: Rechazar + verified: Verificado + rejected: Rechazado + filter: Filtro + filter_all: Todas + filter_verified: Verificadas + filter_rejected: Rechazadas tags: index: title: 'Temas de debate' diff --git a/config/locales/moderation.en.yml b/config/locales/moderation.en.yml index c3a765104..cf53051ed 100644 --- a/config/locales/moderation.en.yml +++ b/config/locales/moderation.en.yml @@ -3,10 +3,4 @@ en: dashboard: index: title: Moderation - organizations: - index: - title: Organizations - verify: Verify - reject: Reject - verified: Verified - rejected: Rejected + diff --git a/config/locales/moderation.es.yml b/config/locales/moderation.es.yml index 958bd7c75..a921f0827 100644 --- a/config/locales/moderation.es.yml +++ b/config/locales/moderation.es.yml @@ -3,11 +3,5 @@ es: dashboard: index: title: Moderación - organizations: - index: - title: Organizaciones - verify: Verificar - reject: Rechazar - verified: Verificado - rejected: Rechazado + diff --git a/config/routes.rb b/config/routes.rb index 7ccbe2bb0..34fa752e1 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,18 +28,18 @@ Rails.application.routes.draw do namespace :admin do root to: "dashboard#index" - - resources :tags, only: [:index, :create, :update, :destroy] - end - - namespace :moderation do - root to: "dashboard#index" resources :organizations, only: :index do member do put :verify put :reject end end + + resources :tags, only: [:index, :create, :update, :destroy] + end + + namespace :moderation do + root to: "dashboard#index" end # Example of regular route: diff --git a/spec/features/moderation/organizations_spec.rb b/spec/features/admin/organizations_spec.rb similarity index 76% rename from spec/features/moderation/organizations_spec.rb rename to spec/features/admin/organizations_spec.rb index 22cf8d2db..626eb9f9e 100644 --- a/spec/features/moderation/organizations_spec.rb +++ b/spec/features/admin/organizations_spec.rb @@ -4,21 +4,21 @@ feature 'Moderations::Organizations' do background do - moderator = create(:user) - create(:moderator, user: moderator) + administrator = create(:user) + create(:administrator, user: administrator) - login_as(moderator) + login_as(administrator) end scenario "pending organizations have links to verify and reject" do organization = create(:organization) - visit moderation_organizations_path + visit admin_organizations_path expect(page).to have_selector(:link_or_button, 'Verify') expect(page).to have_selector(:link_or_button, 'Reject') click_on 'Verify' - expect(current_path).to eq(moderation_organizations_path) + expect(current_path).to eq(admin_organizations_path) expect(page).to have_content ('Verified') expect(organization.reload.verified?).to eq(true) @@ -27,13 +27,13 @@ feature 'Moderations::Organizations' do scenario "verified organizations have link to reject" do organization = create(:verified_organization) - visit moderation_organizations_path + visit admin_organizations_path expect(page).to have_content ('Verified') expect(page).to_not have_selector(:link_or_button, 'Verify') expect(page).to have_selector(:link_or_button, 'Reject') click_on 'Reject' - expect(current_path).to eq(moderation_organizations_path) + expect(current_path).to eq(admin_organizations_path) expect(page).to have_content ('Rejected') expect(organization.reload.rejected?).to eq(true) @@ -42,13 +42,13 @@ feature 'Moderations::Organizations' do scenario "rejected organizations have link to verify" do organization = create(:rejected_organization) - visit moderation_organizations_path + visit admin_organizations_path expect(page).to have_content ('Rejected') expect(page).to have_selector(:link_or_button, 'Verify') expect(page).to_not have_selector(:link_or_button, 'Reject') click_on 'Verify' - expect(current_path).to eq(moderation_organizations_path) + expect(current_path).to eq(admin_organizations_path) expect(page).to have_content ('Verified') expect(organization.reload.verified?).to eq(true)