changed: assignment of group experts was moved to the group members page

Author: jeabakker

classes/ColdTrick/Questions/Menus/Relationship.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace ColdTrick\Questions\Menus;
+
+use Elgg\Menu\MenuItems;
+
+/**
+ * Add menu items to the relationship menu
+ */
+class Relationship {
+	
+	/**
+	 * (un)assign group question expert
+	 *
+	 * @param \Elgg\Event $event 'register', 'menu:relationship'
+	 *
+	 * @return MenuItems|null
+	 */
+	public static function toggleGroupExpert(\Elgg\Event $event): ?MenuItems {
+		$user = elgg_get_logged_in_user_entity();
+		if (!questions_experts_enabled() || !$user instanceof \ElggUser) {
+			return null;
+		}
+		
+		$relationship = $event->getParam('relationship');
+		if (!$relationship instanceof \ElggRelationship || $relationship->relationship !== 'member') {
+			return null;
+		}
+		
+		$member = get_user($relationship->guid_one);
+		$group = get_entity($relationship->guid_two);
+		if (!$member instanceof \ElggUser || !$group instanceof \ElggGroup) {
+			return null;
+		}
+		
+		if (!$group->canEdit($user->guid) || !$group->isToolEnabled('questions')) {
+			return null;
+		}
+		
+		/** @var MenuItems $items */
+		$result = $event->getValue();
+		
+		$is_expert = $member->hasRelationship($group->guid, QUESTIONS_EXPERT_ROLE);
+		
+		$result[] = \ElggMenuItem::factory([
+			'name' => 'questions_expert',
+			'icon' => 'level-up-alt',
+			'text' => elgg_echo('questions:menu:user_hover:make_expert'),
+			'href' => elgg_generate_action_url('questions/toggle_expert', [
+				'user_guid' => $member->guid,
+				'guid' => $group->guid,
+			]),
+			'data-toggle' => 'questions-expert-undo',
+			'item_class' => $is_expert ? 'hidden' : null,
+		]);
+		
+		$result[] = \ElggMenuItem::factory([
+			'name' => 'questions_expert_undo',
+			'icon' => 'level-down-alt',
+			'text' => elgg_echo('questions:menu:user_hover:remove_expert'),
+			'href' => elgg_generate_action_url('questions/toggle_expert', [
+				'user_guid' => $member->guid,
+				'guid' => $group->guid,
+			]),
+			'data-toggle' => 'questions-expert',
+			'item_class' => $is_expert ? null : 'hidden',
+		]);
+		
+		return $result;
+	}
+}

classes/ColdTrick/Questions/Menus/UserHover.php

@@ -18,7 +18,7 @@ class UserHover {
 	 */
 	public static function registerToggleExpert(\Elgg\Event $event): ?MenuItems {
 		// are experts enabled
-		if (!questions_experts_enabled()) {
+		if (!questions_experts_enabled() || !elgg_is_admin_logged_in()) {
 			return null;
 		}
 
@@ -28,32 +28,22 @@ public static function registerToggleExpert(\Elgg\Event $event): ?MenuItems {
 			return null;
 		}
 
-		// get page owner
-		$page_owner = elgg_get_page_owner_entity();
-		if (!$page_owner instanceof \ElggGroup) {
-			$page_owner = elgg_get_site_entity();
-		}
-		
-		// can the current person edit the page owner, to assign the role
-		// and is the current user not the owner of this page owner
-		if (!$page_owner->canEdit()) {
-			return null;
-		}
+		$site = elgg_get_site_entity();
 
 		/* @var $items MenuItems */
 		$items = $event->getValue();
 
-		$is_expert = $user->hasRelationship($page_owner->guid, QUESTIONS_EXPERT_ROLE);
+		$is_expert = $user->hasRelationship($site->guid, QUESTIONS_EXPERT_ROLE);
 
 		$items[] = \ElggMenuItem::factory([
 			'name' => 'questions_expert',
 			'icon' => 'level-up-alt',
 			'text' => elgg_echo('questions:menu:user_hover:make_expert'),
 			'href' => elgg_generate_action_url('questions/toggle_expert', [
 				'user_guid' => $user->guid,
-				'guid' => $page_owner->guid,
+				'guid' => $site->guid,
 			]),
-			'section' => ($page_owner instanceof \ElggSite) ? 'admin' : 'action',
+			'section' => 'admin',
 			'data-toggle' => 'questions-expert-undo',
 			'item_class' => $is_expert ? 'hidden' : null,
 		]);
@@ -64,9 +54,9 @@ public static function registerToggleExpert(\Elgg\Event $event): ?MenuItems {
 			'text' => elgg_echo('questions:menu:user_hover:remove_expert'),
 			'href' => elgg_generate_action_url('questions/toggle_expert', [
 				'user_guid' => $user->guid,
-				'guid' => $page_owner->guid,
+				'guid' => $site->guid,
 			]),
-			'section' => ($page_owner instanceof \ElggSite) ? 'admin' : 'action',
+			'section' => 'admin',
 			'data-toggle' => 'questions-expert',
 			'item_class' => $is_expert ? null : 'hidden',
 		]);

elgg-plugin.php

@@ -122,6 +122,9 @@
 			'menu:filter:questions/groups' => [
 				'\ColdTrick\Questions\Menus\Filter::registerQuestionsGroups' => [],
 			],
+			'menu:relationship' => [
+				'\ColdTrick\Questions\Menus\Relationship::toggleGroupExpert' => [],
+			],
 			'menu:owner_block' => [
 				'\ColdTrick\Questions\Menus\OwnerBlock::registerQuestions' => [],
 			],