Fix author and role exclude dropdown

Author: Luke Carbis

classes/class-settings.php

@@ -84,7 +84,12 @@ public function get_users() {
 			'message' => esc_html__( 'There was an error in the request', 'stream' ),
 		);
 
-		$search = wp_unslash( trim( wp_stream_filter_input( INPUT_POST, 'find' ) ) );
+		$search = '';
+		$input  = wp_stream_filter_input( INPUT_POST, 'find' );
+
+		if ( ! isset( $input['term'] ) ) {
+			$search = wp_unslash( trim( $input['term'] ) );
+		}
 
 		$request = (object) array(
 			'find' => $search,
@@ -123,6 +128,7 @@ public function get_users() {
 
 		$response->status  = true;
 		$response->message = '';
+		$response->roles   = $this->get_roles();
 		$response->users   = array();
 		$users_added_to_response = array();
 

ui/css/admin.css

@@ -18,28 +18,33 @@
 	overflow: visible;
 }
 
-.post-type-wp_stream_alerts .select2 .select2-selection {
+.post-type-wp_stream_alerts .select2 .select2-selection,
+.stream-exclude-list .select2 .select2-selection{
 	border-color: #ccc;
 	background: #f7f7f7;
 	-webkit-box-shadow: 0 1px 0 #ccc;
 	box-shadow: 0 1px 0 #ccc;
 }
 
-.post-type-wp_stream_alerts .select2 .select2-selection--multiple {
+.post-type-wp_stream_alerts .select2 .select2-selection--multiple,
+.stream-exclude-list .select2 .select2-selection--multiple{
 	font-size: 0;
 	min-height: 28px;
 }
 
-.post-type-wp_stream_alerts .select2-container.select2-container--focus .select2-selection--multiple {
+.post-type-wp_stream_alerts .select2-container.select2-container--focus .select2-selection--multiple,
+.stream-exclude-list .select2-container.select2-container--focus .select2-selection--multiple{
 	border: solid #ccc 1px;
 }
 
-.post-type-wp_stream_alerts .select2-container .select2-selection--multiple .select2-selection__choice {
+.post-type-wp_stream_alerts .select2-container .select2-selection--multiple .select2-selection__choice,
+.stream-exclude-list .select2-container .select2-selection--multiple .select2-selection__choice{
 	margin-top: 4px;
 	margin-bottom: 3px;
 }
 
-.post-type-wp_stream_alerts .select2 .select2-selection .select2-selection__rendered {
+.post-type-wp_stream_alerts .select2 .select2-selection .select2-selection__rendered,
+.stream-exclude-list .select2 .select2-selection .select2-selection__rendered{
 	color: #555;
 }
 
@@ -470,6 +475,11 @@
 	border: 1px solid rgba(160,0,0,0.75);
 }
 
+.stream-exclude-list .icon-users {
+	top: -3px !important;
+	position: relative !important;
+}
+
 .post-type-wp_stream_alerts .select2-results__option .parent {
 	font-weight: bold;
 }

ui/js/exclude.js

@@ -76,38 +76,10 @@ jQuery( function( $ ) {
 						};
 					},
 					processResults: function( response ) {
-						var roles  = [];
-
-						$( 'option', $input_user ).each( function() {
-							if ( $( this ).val() === '' ) {
-								return;
-							}
-							if ( ! $.isNumeric( $( this ).val() ) ) {
-								roles.push({
-									'id' : $( this ).val(),
-									'text' : $( this ).text()
-								});
-							}
-						});
-
-						roles = $.grep(
-							roles,
-							function( role ) {
-								var roleVal = $input_user.data( 'select2' ).dropdown.$search
-								    .val()
-								    .toLowerCase();
-								var rolePos = role
-								    .text
-								    .toLowerCase()
-								    .indexOf( roleVal );
-								return rolePos >= 0;
-							}
-						);
-
 						var answer = {
 							results: [
 								{ text: '', id: '' },
-								{ text: 'Roles', children: roles },
+								{ text: 'Roles', children: [] },
 								{ text: 'Users', children: [] }
 							]
 						};
@@ -116,15 +88,23 @@ jQuery( function( $ ) {
 							return answer;
 						}
 
-						$.each( response.data.users, function( k, user ) {
-							if ( $.contains( roles, user.id ) ) {
-								user.disabled = true;
-							}
+						if ( undefined === response.data.users || undefined === response.data.roles ) {
+							return answer;
+						}
+
+						var roles = [];
+
+						$.each( response.data.roles, function( id, text ) {
+							roles.push({
+								'id' : id,
+								'text' : text
+							});
 						});
 
+						answer.results[ 1 ].children = roles;
 						answer.results[ 2 ].children = response.data.users;
 
-						// Notice we return the value of more so Select2 knows if more results can be loaded
+						// Return the value of more so Select2 knows if more results can be loaded
 						return answer;
 					}
 				},
@@ -263,7 +243,8 @@ jQuery( function( $ ) {
 	initSettingsSelect2();
 
 	$( '.stream-exclude-list tr:not(.hidden) select.select2-select.author_or_role' ).each( function() {
-		$( this ).val( $( this ).data( 'selected-id' ) ).trigger( 'change' );
+		var $option = $('<option selected>' + $( this ).data( 'selected-text' ) + '</option>').val( $( this ).data( 'selected-id' ) );
+		$( this ).append( $option ).trigger( 'change' );
 	});
 
 	$( '.stream-exclude-list tr:not(.hidden) select.select2-select.connector_or_context' ).each( function() {