From 06e7461245933a5b91c95178ccb85e207a6774ba Mon Sep 17 00:00:00 2001 From: Nedim Uka Date: Thu, 25 Oct 2018 14:15:05 +0200 Subject: [PATCH] Use roles from hook methods --- .../includes/product/class-wiaas-product-supplier.php | 8 ++++---- .../wiaas/includes/user/class-wiaas-user-organization.php | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/app/plugins/wiaas/includes/product/class-wiaas-product-supplier.php b/backend/app/plugins/wiaas/includes/product/class-wiaas-product-supplier.php index 0aff85a..2bfc50f 100644 --- a/backend/app/plugins/wiaas/includes/product/class-wiaas-product-supplier.php +++ b/backend/app/plugins/wiaas/includes/product/class-wiaas-product-supplier.php @@ -6,8 +6,8 @@ class Wiaas_Product_Supplier { public static function init() { add_action('init', array(__CLASS__, 'register_supplier_taxonomy')); - add_action('wiaas_organization_created', array(__CLASS__, 'on_organization_added')); - add_action('wiaas_organization_roles_updated' , array(__CLASS__, 'on_organization_added')); + add_action('wiaas_organization_created', array(__CLASS__, 'on_organization_added'),20, 2); + add_action('wiaas_organization_roles_updated' , array(__CLASS__, 'on_organization_added'),20, 2); } /** @@ -49,9 +49,9 @@ class Wiaas_Product_Supplier { * @param $organization_id * @param $roles */ - public static function on_organization_added($organization_id) { + public static function on_organization_added($organization_id, $roles) { + $organization = get_term_by('id', $organization_id, 'wiaas-user-organization'); - $roles = wiaas_get_organization_roles($organization_id); $supplier = term_exists($organization->slug, 'supplier'); diff --git a/backend/app/plugins/wiaas/includes/user/class-wiaas-user-organization.php b/backend/app/plugins/wiaas/includes/user/class-wiaas-user-organization.php index 503657e..03874f9 100644 --- a/backend/app/plugins/wiaas/includes/user/class-wiaas-user-organization.php +++ b/backend/app/plugins/wiaas/includes/user/class-wiaas-user-organization.php @@ -65,8 +65,9 @@ class Wiaas_User_Organization extends WP_User_Taxonomy { */ public static function on_organization_added($organization_id) { self::_create_organization_access_group($organization_id); - $roles = wiaas_get_organization_roles($organization_id); + + do_action('wiaas_organization_created', $organization_id, $roles); self::_assign_organization_roles_capabilities($organization_id, $roles); }