From 81d8b9b9ed757b6199a5deb7d0d22f2bc8e912d6 Mon Sep 17 00:00:00 2001 From: iagirre Date: Thu, 16 Nov 2017 16:36:09 +0100 Subject: [PATCH 1/5] Admin menu added to management --- app/views/layouts/management.html.erb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index 4dc4aec12..3fcf83f6e 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -29,6 +29,19 @@ + <% if current_administrator? %> +
+ +
+
    + <%= render "admin/shared/admin_shortcuts" %> + <%= render "shared/admin_login_items" %> + <%= render "devise/menu/login_items" %> +
+
+ +
+ <% end %> From 7a7ae5fa2ee5285f832efba8e050aeeaeb5b8a02 Mon Sep 17 00:00:00 2001 From: iagirre Date: Fri, 17 Nov 2017 11:41:44 +0100 Subject: [PATCH 2/5] The admin menu is shown in the management section if the user who logged in is an admin --- app/controllers/management/base_controller.rb | 13 ++++++++++++- app/helpers/users_helper.rb | 4 ++-- app/views/layouts/management.html.erb | 8 ++++---- app/views/shared/_admin_login_items.html.erb | 2 +- 4 files changed, 19 insertions(+), 8 deletions(-) diff --git a/app/controllers/management/base_controller.rb b/app/controllers/management/base_controller.rb index bcebfebaa..c5d8edec3 100644 --- a/app/controllers/management/base_controller.rb +++ b/app/controllers/management/base_controller.rb @@ -6,6 +6,7 @@ class Management::BaseController < ActionController::Base helper_method :managed_user helper_method :current_user + helper_method :user_signed_in private @@ -22,7 +23,10 @@ class Management::BaseController < ActionController::Base end def managed_user - @managed_user ||= Verification::Management::ManagedUser.find(session[:document_type], session[:document_number]) + @managed_user ||= Verification::Management::ManagedUser.find( + session[:document_type], + session[:document_number] + ) end def check_verified_user(alert_msg) @@ -49,4 +53,11 @@ class Management::BaseController < ActionController::Base def clear_password session[:new_password] = nil end + + def user_signed_in + if current_manager + @user_signed_in = User.find(session[:manager]["login"].last(1)) + end + end + end diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 980dd1e39..c0574f78a 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -52,8 +52,8 @@ module UsersHelper current_user && current_user.manager? end - def show_admin_menu? - current_administrator? || current_moderator? || current_valuator? || current_manager? + def show_admin_menu?(user = nil) + current_administrator? || current_moderator? || current_valuator? || current_manager? || user.administrator? end def interests_title_text(user) diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index 3fcf83f6e..9fc4f411f 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -29,14 +29,14 @@ - <% if current_administrator? %> + <% if user_signed_in.administrator? %>
    - <%= render "admin/shared/admin_shortcuts" %> - <%= render "shared/admin_login_items" %> - <%= render "devise/menu/login_items" %> + <%= render "admin/shared/admin_shortcuts", current_user: user_signed_in %> + <%= render "shared/admin_login_items", current_user: user_signed_in %> + <%= render "devise/menu/login_items", current_user: user_signed_in %>
diff --git a/app/views/shared/_admin_login_items.html.erb b/app/views/shared/_admin_login_items.html.erb index 3fbb34fcc..85407398a 100644 --- a/app/views/shared/_admin_login_items.html.erb +++ b/app/views/shared/_admin_login_items.html.erb @@ -1,4 +1,4 @@ -<% if show_admin_menu? %> +<% if show_admin_menu?(current_user) %>
  • <%= link_to t("layouts.header.administration_menu"), "#", rel: "nofollow", class: "hide-for-small-only" %>
      From 90f8ad26637af7d34140b752d0a797d24e2c4610 Mon Sep 17 00:00:00 2001 From: iagirre Date: Fri, 17 Nov 2017 12:56:27 +0100 Subject: [PATCH 3/5] Fixed some code that crashed in Travis build and added some test to check the functionality --- app/helpers/users_helper.rb | 2 +- spec/features/management_spec.rb | 33 ++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 spec/features/management_spec.rb diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index c0574f78a..4098b535e 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -53,7 +53,7 @@ module UsersHelper end def show_admin_menu?(user = nil) - current_administrator? || current_moderator? || current_valuator? || current_manager? || user.administrator? + current_administrator? || current_moderator? || current_valuator? || current_manager? || (user && user.administrator?) end def interests_title_text(user) diff --git a/spec/features/management_spec.rb b/spec/features/management_spec.rb new file mode 100644 index 000000000..eb3630c5a --- /dev/null +++ b/spec/features/management_spec.rb @@ -0,0 +1,33 @@ +require 'rails_helper' + +feature 'Management' do + let(:user) { create(:user) } + + scenario "Should show admin menu if logged user is admin" do + create(:administrator, user: user) + login_as(user) + visit root_path + + expect(page).to have_link("Management") + + click_link "Management" + + expect(page).to have_content("My activity") + expect(page).to have_content("My account") + expect(page).to have_content("Sign out") + end + + scenario "Should not show admin menu if logged user is manager" do + create(:manager, user: user) + login_as(user) + visit root_path + + expect(page).to have_link("Management") + + click_link "Management" + + expect(page).not_to have_content("My activity") + expect(page).not_to have_content("My account") + expect(page).not_to have_content("Sign out") + end +end From 2fafceb81dcc37959542cc28bbd258e7b68c5fa4 Mon Sep 17 00:00:00 2001 From: iagirre Date: Fri, 17 Nov 2017 14:07:02 +0100 Subject: [PATCH 4/5] Errors after running Travis fixed --- app/controllers/management/base_controller.rb | 6 +++--- app/views/layouts/management.html.erb | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/management/base_controller.rb b/app/controllers/management/base_controller.rb index c5d8edec3..1bae36a76 100644 --- a/app/controllers/management/base_controller.rb +++ b/app/controllers/management/base_controller.rb @@ -6,7 +6,7 @@ class Management::BaseController < ActionController::Base helper_method :managed_user helper_method :current_user - helper_method :user_signed_in + helper_method :manager_logged_in private @@ -54,9 +54,9 @@ class Management::BaseController < ActionController::Base session[:new_password] = nil end - def user_signed_in + def manager_logged_in if current_manager - @user_signed_in = User.find(session[:manager]["login"].last(1)) + @manager_logged_in = User.find_by(id: session[:manager]["login"].last(1)) end end diff --git a/app/views/layouts/management.html.erb b/app/views/layouts/management.html.erb index 9fc4f411f..e964676aa 100644 --- a/app/views/layouts/management.html.erb +++ b/app/views/layouts/management.html.erb @@ -29,14 +29,14 @@
    • - <% if user_signed_in.administrator? %> + <% if show_admin_menu?(manager_logged_in) %>
      - <%= render "admin/shared/admin_shortcuts", current_user: user_signed_in %> - <%= render "shared/admin_login_items", current_user: user_signed_in %> - <%= render "devise/menu/login_items", current_user: user_signed_in %> + <%= render "admin/shared/admin_shortcuts", current_user: manager_logged_in %> + <%= render "shared/admin_login_items", current_user: manager_logged_in %> + <%= render "devise/menu/login_items", current_user: manager_logged_in %>
    From 6e238ae252a39258b97032dde74bab41ffda2c6f Mon Sep 17 00:00:00 2001 From: iagirre Date: Mon, 20 Nov 2017 09:39:57 +0100 Subject: [PATCH 5/5] Changed redirection when signing out from management section --- app/controllers/users/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index 5605e3a00..d16f9c87e 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -11,7 +11,7 @@ class Users::SessionsController < Devise::SessionsController end def after_sign_out_path_for(resource) - request.referer.present? ? request.referer : super + request.referer.present? && !request.referer.match("management") ? request.referer : super end def verifying_via_email?