diff --git a/app/helpers/admin/enterprises_helper.rb b/app/helpers/admin/enterprises_helper.rb index bf39ee199b..e9d337c7c0 100644 --- a/app/helpers/admin/enterprises_helper.rb +++ b/app/helpers/admin/enterprises_helper.rb @@ -14,7 +14,7 @@ module Admin producers.size == 1 ? producers.first.id : nil end - def can_connect_apps?(enterprise) + def managed_by_user?(enterprise) enterprise.in?(spree_current_user.enterprises) end diff --git a/app/views/admin/enterprises/form/_connected_apps.html.haml b/app/views/admin/enterprises/form/_connected_apps.html.haml index 81dfb240a4..f2870da01f 100644 --- a/app/views/admin/enterprises/form/_connected_apps.html.haml +++ b/app/views/admin/enterprises/form/_connected_apps.html.haml @@ -6,9 +6,9 @@ %p= t ".tagline" %div - if enterprise.connected_apps.empty? - = button_to t(".enable"), admin_enterprise_connected_apps_path(enterprise.id), method: :post, disabled: !can_connect_apps?(enterprise) + = button_to t(".enable"), admin_enterprise_connected_apps_path(enterprise.id), method: :post, disabled: !managed_by_user?(enterprise) -# This is only seen by super-admins: - %em= t(".need_to_be_manager") unless can_connect_apps?(enterprise) + %em= t(".need_to_be_manager") unless managed_by_user?(enterprise) - elsif enterprise.connected_apps.connecting.present? %button{ disabled: true } %i.spinner.fa.fa-spin.fa-circle-o-notch