From da4beacdb188eed921bd78ec70a72f69ff3d20be Mon Sep 17 00:00:00 2001 From: Patri Date: Thu, 15 May 2014 03:41:15 +0200 Subject: [PATCH] actions according to active/inactive user --- app/helpers/users_helper.rb | 4 ++-- config/locales/es.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 9b17413..1680e3f 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -15,8 +15,8 @@ module UsersHelper url: user_path(user), edit_link: (superadmin? || admin? || user == current_user)? edit_user_path(user) : "", - cancel_link: (superadmin? || admin?)? member_path(@memberships[user.id]) : "", - manage_link: ((superadmin? || admin?) && user != current_user)? toggle_manager_member_path(@memberships[user.id]) : "", + cancel_link: ((superadmin? || admin?) && !@memberships[user.id].active?)? member_path(@memberships[user.id]) : "", + manage_link: ((superadmin? || admin?) && user != current_user && @memberships[user.id].active?)? toggle_manager_member_path(@memberships[user.id]) : "", manager: @memberships[user.id].manager ||= false, activate_link: (superadmin? || admin?)? toggle_active_member_path(@memberships[user.id]) : "", active: @memberships[user.id].active? diff --git a/config/locales/es.yml b/config/locales/es.yml index 3bd38b5..b657d2a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -172,7 +172,7 @@ es: delete: Borrar save: Guardar add_new: Crear nuevo - cancel_membership: Cancelar afiliación + cancel_membership: Borrar definitivamente back: Atrás give_time: Transferir tiempo filter: Filtro