feat(groups): break down groups/all page in smaller views

Make it easier to override individual parts and add new listing types to the groups/all page
tacid · Sep 24, 2016 · c6de14c · c6de14c
1 parent 77e3e85
commit c6de14c
Show file tree

Hide file tree

Showing 8 changed files with 90 additions and 68 deletions.
diff --git a/mod/discussions/views/default/discussion/listing/all.php b/mod/discussions/views/default/discussion/listing/all.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * Renders a list of discussions, optionally filtered by container type
+ *
+ * @uses $vars['container_type'] Container type filter to apply
+ */
+$options = array(
+	'type' => 'object',
+	'subtype' => 'discussion',
+	'order_by' => 'e.last_action desc',
+	'limit' => max(20, elgg_get_config('default_limit')),
+	'full_view' => false,
+	'no_results' => elgg_echo('discussion:none'),
+	'preload_owners' => true,
+	'preload_containers' => true,
+);
+
+$container_type = elgg_extract('container_type', $vars);
+if ($container_type) {
+	$dbprefix = elgg_get_config('dbprefix');
+	$container_type = sanitize_string($container_type);
+	$options['joins'][] = "JOIN {$dbprefix}entities ce ON ce.guid = e.container_guid";
+	$options['wheres'][] = "ce.type = '$container_type'";
+}
+
+echo elgg_list_entities($options);
diff --git a/mod/discussions/views/default/groups/listing/discussion.php b/mod/discussions/views/default/groups/listing/discussion.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * Rendered on /groups/all?filter=discussion
+ * Displays a list of discussions created within groups
+ */
+echo elgg_view('discussion/listing/all', [
+	'container_type' => 'group',
+]);
diff --git a/mod/discussions/views/default/resources/discussion/all.php b/mod/discussions/views/default/resources/discussion/all.php
@@ -3,16 +3,7 @@
 elgg_pop_breadcrumb();
 elgg_push_breadcrumb(elgg_echo('discussion'));
 
-$content = elgg_list_entities(array(
-	'type' => 'object',
-	'subtype' => 'discussion',
-	'order_by' => 'e.last_action desc',
-	'limit' => max(20, elgg_get_config('default_limit')),
-	'full_view' => false,
-	'no_results' => elgg_echo('discussion:none'),
-	'preload_owners' => true,
-	'preload_containers' => true,
-));
+$content = elgg_view('discussion/listing/all');
 
 $title = elgg_echo('discussion:latest');
 

diff --git a/mod/groups/views/default/groups/listing/alpha.php b/mod/groups/views/default/groups/listing/alpha.php
@@ -0,0 +1,14 @@
+<?php
+
+/**
+ * Renders a list of groups ordered alphabetically
+ */
+$dbprefix = elgg_get_config('dbprefix');
+echo elgg_list_entities(array(
+	'type' => 'group',
+	'joins' => ["JOIN {$dbprefix}groups_entity ge ON e.guid = ge.guid"],
+	'order_by' => 'ge.name',
+	'full_view' => false,
+	'no_results' => elgg_echo('groups:none'),
+	'distinct' => false,
+));
diff --git a/mod/groups/views/default/groups/listing/featured.php b/mod/groups/views/default/groups/listing/featured.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Renders a list of featured groups
+ */
+echo elgg_list_entities_from_metadata(array(
+	'type' => 'group',
+	'metadata_name' => 'featured_group',
+	'metadata_value' => 'yes',
+	'full_view' => false,
+	'no_results' => elgg_echo('groups:nofeatured'),
+));
diff --git a/mod/groups/views/default/groups/listing/newest.php b/mod/groups/views/default/groups/listing/newest.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * Renders a list of groups by creation date
+ */
+echo elgg_list_entities(array(
+	'type' => 'group',
+	'full_view' => false,
+	'no_results' => elgg_echo('groups:none'),
+	'distinct' => false,
+));
diff --git a/mod/groups/views/default/groups/listing/popular.php b/mod/groups/views/default/groups/listing/popular.php
@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * Renders a list of groups with most members
+ */
+echo elgg_list_entities_from_relationship_count(array(
+	'type' => 'group',
+	'relationship' => 'member',
+	'inverse_relationship' => false,
+	'full_view' => false,
+	'no_results' => elgg_echo('groups:none'),
+));
diff --git a/mod/groups/views/default/resources/groups/all.php b/mod/groups/views/default/resources/groups/all.php
@@ -9,66 +9,12 @@
 }
 
 $selected_tab = get_input('filter', 'newest');
-
-switch ($selected_tab) {
-	case 'popular':
-		$content = elgg_list_entities_from_relationship_count(array(
-			'type' => 'group',
-			'relationship' => 'member',
-			'inverse_relationship' => false,
-			'full_view' => false,
-			'no_results' => elgg_echo('groups:none'),
-		));
-		break;
-	case 'discussion':
-		// Get only the discussions that have been created inside a group
-		$dbprefix = elgg_get_config('dbprefix');
-		$content = elgg_list_entities(array(
-			'type' => 'object',
-			'subtype' => 'discussion',
-			'order_by' => 'e.last_action desc',
-			'limit' => 40,
-			'full_view' => false,
-			'no_results' => elgg_echo('discussion:none'),
-			'joins' => array("JOIN {$dbprefix}entities ce ON ce.guid = e.container_guid"),
-			'wheres' => array('ce.type = "group"'),
-			'distinct' => false,
-			'preload_containers' => true,
-		));
-		break;
-	case 'featured':
-		$content = elgg_list_entities_from_metadata(array(
-			'type' => 'group',
-			'metadata_name' => 'featured_group',
-			'metadata_value' => 'yes',
-			'full_view' => false,
-		));
-		if (!$content) {
-			$content = elgg_echo('groups:nofeatured');
-		}
-		break;
-	case 'alpha':
-		$dbprefix = elgg_get_config('dbprefix');
-		$content = elgg_list_entities(array(
-			'type' => 'group',
-			'joins' => ["JOIN {$dbprefix}groups_entity ge ON e.guid = ge.guid"],
-			'order_by' => 'ge.name',
-			'full_view' => false,
-			'no_results' => elgg_echo('groups:none'),
-			'distinct' => false,
-		));
-		break;
-	case 'newest':
-	default:
-		$content = elgg_list_entities(array(
-			'type' => 'group',
-			'full_view' => false,
-			'no_results' => elgg_echo('groups:none'),
-			'distinct' => false,
-		));
-		break;
+if (!elgg_view_exists("groups/listing/$selected_tab")) {
+	$selected_tab = 'newest';
 }
 
+$content = elgg_view("groups/listing/$selected_tab", $vars);
+
 $filter = elgg_view('groups/group_sort_menu', array('selected' => $selected_tab));
 
 $sidebar = elgg_view('groups/sidebar/find');