From: Laury GvR Date: Mon, 17 Apr 2017 18:39:24 +0000 (-0400) Subject: Merging develop back into this branch X-Git-Tag: v2.9.15^2~15^2~8 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=58ad30ec23350d4f4d6535a3a16395708b799a6f;p=WP-Plugins%2Fglm-member-db.git Merging develop back into this branch --- 58ad30ec23350d4f4d6535a3a16395708b799a6f diff --cc models/admin/members/list.php index dfd520f5,5863d418..7d4aa79a --- a/models/admin/members/list.php +++ b/models/admin/members/list.php @@@ -222,31 -209,13 +222,37 @@@ class GlmMembersAdmin_members_list exte $filterFeatured = true; $haveFilter = true; } + + // If doing alpha list + if (isset($_REQUEST['alpha'])) { + $actionData['request']['alpha'] = $_REQUEST['alpha']; + } + + $alphaList = false; + $alphaWhere = ''; + + $alphaSelected = false; + + // Check for alpha selected + if ($actionData['request']['alpha'] && strlen($actionData['request']['alpha']) == 1) { + $alphaSelected = strtoupper($actionData['request']['alpha']); + $alphaWhere .= " AND T.name LIKE '$alphaSelected%'"; + } + + // Get full list for all other filters, but not filtered by alpha (that would be silly) + $alphaList = $this->getAlphaList(' AND '.$where, $alphaSelected); + + // If user clicked a page request then we need to check the savedAlpha value + if (isset($_REQUEST['savedAlpha']) && isset($_REQUEST['pageSelect'])) { + $actionData['request']['alpha'] = $_REQUEST['savedAlpha']; + } + $whereParts = apply_filters('glm-member-db-admin-search-query', $where); + if ( is_array( $whereParts ) && count( $whereParts ) > 0 ) { + $where .= ' AND '.implode(" AND ", $whereParts); + $whereSep = ' AND '; + } + // Get count of members listed $memberCount = $this->getStats($where); diff --cc views/admin/member/index.html index c02c9197,542101a3..030779f5 --- a/views/admin/member/index.html +++ b/views/admin/member/index.html @@@ -7,72 -7,30 +7,72 @@@

{$terms.term_member_cap} Updated

{/if} +
{if $haveMember} - - {if apply_filters('glm_members_menu_members', true)} -

Edit {$terms.term_member_cap} Name and Status

- {/if} - - - - - -
- - - - - -
URL CLick CountsToday: {$clickThroughCounts.day}   
- 		- - - - - -
  Detail Page View CountsToday: {$detailViewCounts.day}   
-
++ +
+
+
+
+
+

{$terms.term_member_cap} Slug:

+
+
+ {$member.fieldData.member_slug} +
+
+
+
+

Date created:

+
+
+ {$member.fieldData.created.date} +
+
+
+
+

URL CLick Counts

+
+
+ Today: {$clickThroughCounts.day}    +
+
+
+
+
+
+
+
+

{$terms.term_member_cap} Display & Access:

+
+
+ {$member.fieldData.access.name} +
+
+
+
+

{$terms.term_member_cap} Type:

+
+
+ {$member.fieldData.member_type.name} +
-
++
+
+
+

Detail Page View Counts

+
+
+ Today: {$detailViewCounts.day}    +
+
+
+
+ {if apply_filters('glm_members_menu_members', true)} +
+ Edit {$terms.term_member_cap} Name and Status +
+ {/if} +
{else}

No {$terms.term_member} information available.

{/if} @@@ -130,7 -88,7 +130,7 @@@


-- ++ {apply_filters('glm_members_admin_member_index_bottomOfMemberSummary', '', {$member.fieldData.id})} {if $haveMember} @@@ -139,86 -97,86 +139,86 @@@ {if apply_filters('glm_members_permit_admin_member_index_view_member_info_version', true)} {if apply_filters('glm_members_permit_admin_member_index_add_member_info_version', true)} {/if} -

-

{$terms.term_member_cap} Profile Versions

- {if apply_filters('glm_members_permit_admin_member_index_add_member_info_version', true)} - -

+

+
+

{$terms.term_member_cap} Profile Versions

+ + Add New {$terms.term_member_cap} Profile Version + - ++ +
Show archived information   - Add New {$terms.term_member_cap} Information Version -

- - {/if} -

-
- - - - - - - - - - - + + +
+
StatusReference NameCreatedLast Update
+ + + + + + + + + + - {if $haveInfoRecords} - {assign var="i" value="0"} - {foreach $memberInfoRecords as $m} + {if $haveInfoRecords} + {assign var="i" value="0"} + {foreach $memberInfoRecords as $m} - {if $m.status.value == $statusTypeNumbers.Active || apply_filters('glm_members_permit_admin_member_index_list_inactive_info', true)} - {if $i++ is odd by 1} - - {else} - - {/if} - - - - - - + {if $m.status.value == $statusTypeNumbers.Active || apply_filters('glm_members_permit_admin_member_index_list_inactive_info', true)} + {if $i++ is odd by 1} + + {else} + + {/if} + + + + + + - {/if} - {/foreach} - {else} - - {/if} - -
StatusReference NameCreatedLast Update
- {$m.status.name} - {$m.reference_name}{$m.create_time.datetime}{$m.modify_time.datetime} - {if $m.bad_lat_lon}Bad Map Location{/if} - {if apply_filters('glm_members_permit_admin_member_index_clone_activate_info_version', true)} - Clone  - {if $m.status.name != 'Active'}Activate{/if} - {/if} -
+ {$m.status.name} + {$m.reference_name}{$m.create_time.datetime}{$m.modify_time.datetime} + {if $settings.memb_info_location} {if $m.bad_lat_lon}Bad Map Location{/if} {/if} + {if apply_filters('glm_members_permit_admin_member_index_clone_activate_info_version', true)} + Clone  + {if $m.status.name != 'Active'}Activate{/if} + {/if} +
Click here to start entering information for this {$terms.term_member}.
- {/if} + {/if} + {/foreach} + {else} + Click here to start entering information for this {$terms.term_member}. {/if} - {/if} + + + {/if} + {/if} + {/if} +
+
-

 

- - {else} -

You do not have any {$terms.term_member_cap} Types setup.

-

You must have at least one {$terms.term_member_cap} Type to add a new {$terms.term_member}.

- Click here to add {$terms.term_member_cap} Types. - {/if} -{else} -

No {$terms.term_member} currently selected.

-{/if} - -{if $lockedToMember} -
- {apply_filters('glm-member-db-dashboard-member-widgets', $member)} -
-{/if} + {else} +

You do not have any {$terms.term_member_cap} Types setup.

+

You must have at least one {$terms.term_member_cap} Type to add a new {$terms.term_member}.

+ Click here to add {$terms.term_member_cap} Types. + {/if} + {else} +

No {$terms.term_member} currently selected.

+ {/if} + {if $lockedToMember} +
+ {apply_filters('glm-member-db-dashboard-member-widgets', $member)} +
+ {/if} - + +