From d1477f767690c2ec73d7492283c8087a7c9b8c87 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Sun, 27 Sep 2015 17:04:19 -0400 Subject: [PATCH] Hotfix for short-code category selection in member lists and other assorted problems. --- classes/data/dataMemberInfo.php | 10 ++++----- classes/glmPluginSupport.php | 18 +++++++++++++++- config/plugin.ini | 6 +++--- controllers/admin.php | 2 ++ controllers/front.php | 2 ++ lib/GlmDataAbstract/DataAbstract.php | 17 ++++++++------- models/front/members/detail.php | 5 ++++- models/front/members/list.php | 32 +++++++++++++++------------- views/admin/shortcodes/index.html | 12 +++++------ views/front/members/detail.html | 13 ++++++----- views/front/members/list.html | 8 +++---- 11 files changed, 75 insertions(+), 50 deletions(-) diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php index a679a534..ed4e18d1 100644 --- a/classes/data/dataMemberInfo.php +++ b/classes/data/dataMemberInfo.php @@ -155,7 +155,7 @@ class GlmDataMemberInfo extends GlmDataAbstract 'list' => $this->config['status'], 'required' => true, 'default' => $this->config['status_numb']['Pending'], - 'force_list' => true, +// 'force_list' => true, 'use' => 'a' ), @@ -209,7 +209,7 @@ class GlmDataMemberInfo extends GlmDataAbstract 'p_field' => 'name', 'p_orderby' => 'name', 'p_blank' => true, - 'force_list' => true, +// 'force_list' => true, 'use' => 'a' ), @@ -219,7 +219,7 @@ class GlmDataMemberInfo extends GlmDataAbstract 'type' => 'list', 'list' => $this->config['states'], 'default' => 'MI', - 'force_list' => true, +// 'force_list' => true, 'use' => 'a' ), @@ -236,7 +236,7 @@ class GlmDataMemberInfo extends GlmDataAbstract 'type' => 'list', 'list' => $this->config['countries'], 'default' => 'US', - 'force_list' => true, +// 'force_list' => true, 'use' => 'a' ), @@ -264,7 +264,7 @@ class GlmDataMemberInfo extends GlmDataAbstract 'p_field' => 'name', 'p_orderby' => 'name', 'p_blank' => true, - 'force_list' => true, +// 'force_list' => true, 'use' => 'a' ), diff --git a/classes/glmPluginSupport.php b/classes/glmPluginSupport.php index a22755ce..fc7260d1 100644 --- a/classes/glmPluginSupport.php +++ b/classes/glmPluginSupport.php @@ -60,6 +60,7 @@ class GlmPluginSupport $dataBlocks = get_option('glmMembersAdminNoticeDataBlocks'); $dataBlocks[] = array('data' => $message, 'title' => $title); update_option('glmMembersAdminNoticeDataBlocks', $dataBlocks); + break; case 'AdminNotice': @@ -89,7 +90,6 @@ class GlmPluginSupport default; $notices = get_option('glmMembersAdminNotices'); $notices[] = $message; -//$notices = array(); update_option('glmMembersAdminNotices', $notices); break; @@ -97,6 +97,22 @@ class GlmPluginSupport } + /* + * Clear all notices + * + * @return void + * @access public + */ + public static function clearNotices () + { + + delete_option('glmMembersAdminNoticeAlerts'); + delete_option('glmMembersAdminNoticeProcess'); + delete_option('glmMembersAdminNoticeDataBlocks'); + delete_option('glmMembersAdminNotices'); + + } + /* * Check if this is a second call to the activation hook by WordPress to activate this plugin. * diff --git a/config/plugin.ini b/config/plugin.ini index 66648c94..8e1fa97d 100644 --- a/config/plugin.ini +++ b/config/plugin.ini @@ -345,9 +345,9 @@ phrase['phrase_test'] = 'test' [chuck:common] admin_debug = true -admin_debug_verbose = true -front_debug = true -front_debug_verbose = true +admin_debug_verbose = false +front_debug = false +front_debug_verbose = false googleMapsApiKey = '' diff --git a/controllers/admin.php b/controllers/admin.php index 38366f1f..d75018ed 100644 --- a/controllers/admin.php +++ b/controllers/admin.php @@ -613,6 +613,8 @@ class glmMembersAdmin extends GlmPluginSupport if (isset($_FILES)) { $this->addNotice("
".print_r($_FILES,1)."
", 'DataBlock', "Request Files Data"); } + } else { + $this->clearNotices(); } /* diff --git a/controllers/front.php b/controllers/front.php index 2e06a820..3fecfe0c 100644 --- a/controllers/front.php +++ b/controllers/front.php @@ -240,6 +240,8 @@ class glmMembersFront extends GlmPluginSupport $this->addNotice("
".print_r($consts,1)."
", 'DataBlock', "Defined Parameters"); $this->addNotice("
".print_r($_REQUEST,1)."
", 'DataBlock', "Request Data"); + } else { + $this->clearNotices(); } /* diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php index c6fe2e09..56802f23 100755 --- a/lib/GlmDataAbstract/DataAbstract.php +++ b/lib/GlmDataAbstract/DataAbstract.php @@ -113,7 +113,7 @@ abstract class GlmDataAbstract * * @access public */ - public $optionIncludeSelectListData = true; + public $optionIncludeSelectListData = false; /** * Delete Restrictions - Not fully sorted out yet * @@ -1573,7 +1573,7 @@ abstract class GlmDataAbstract { return false; } - function dateOutput($f, $d) + function dateOutput($f, $d, $forEdit) { // Check for min/max date values @@ -1611,10 +1611,11 @@ abstract class GlmDataAbstract ); // Build picklists for date input - $date_list = false; - if ($this->optionIncludeSelectListData) { + $date_list = false; - $date_list = $this->buildDateFieldLists($min, $max); + if ($this->optionIncludeSelectListData || $forEdit ) { + + $date_list = $this->buildDateFieldLists($min, $max); // Get default values for list selection and set in date_list array $def_month = date('n', $t); @@ -1857,7 +1858,7 @@ abstract class GlmDataAbstract } - if (!$this->optionIncludeSelectListData) { + if (!$this->optionIncludeSelectListData && !$forEdit) { $time_list = false; } @@ -1977,7 +1978,7 @@ abstract class GlmDataAbstract { return false; } - function datetimeOutput($f, $d) + function datetimeOutput($f, $d, $forEdit) { // Check for min/max date values @@ -2029,7 +2030,7 @@ abstract class GlmDataAbstract // Build picklists for date input $date_list = false; - if ($this->optionIncludeSelectListData) { + if ($this->optionIncludeSelectListData || $forEdit) { $date_list = $this->buildDateFieldLists($min, $max, true); diff --git a/models/front/members/detail.php b/models/front/members/detail.php index 3d865d14..ffcba9ef 100644 --- a/models/front/members/detail.php +++ b/models/front/members/detail.php @@ -162,7 +162,10 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo 'haveMember' => $haveMember, 'member' => $memberData, 'haveImageGallery' => $haveImageGallery, - 'imageGallery' => $imageGallery + 'imageGallery' => $imageGallery, + 'havePackages' => false, + 'packages' => false + ); // Return status, suggested view, and data to controller diff --git a/models/front/members/list.php b/models/front/members/list.php index 89155c97..2db9b53d 100644 --- a/models/front/members/list.php +++ b/models/front/members/list.php @@ -143,25 +143,27 @@ class GlmMembersFront_members_list extends GlmDataMemberInfo // Check if a category has been submitted if (isset($_REQUEST['categorySearch'])) { $catSelected = $_REQUEST['categorySearch'] - 0; + } elseif ($actionData['request']['category']) { + $catSelected = $actionData['request']['category']; + } - // If we have a category ID - if ($catSelected > 0) { + // If we have a category ID + if ($catSelected > 0) { - $where .= $whereSep." T.id in ( - SELECT DISTINCT(member_info) - FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info M, - ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories C - WHERE M.category = $catSelected - OR (C.parent = $catSelected AND M.category = C.id) - )"; - $whereSep = ' AND '; + $where .= $whereSep." T.id in ( + SELECT DISTINCT(member_info) + FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info M, + ".GLM_MEMBERS_PLUGIN_DB_PREFIX."categories C + WHERE M.category in($catSelected) + OR (C.parent in($catSelected) AND M.category = C.id) + )"; + $whereSep = ' AND '; - // Set default to true for the selected category - $categoryData[$catSelected]['default'] = true; - - } - } + // Set default to true for the selected category + $c = explode(',', $catSelected); + $categoryData[$c[0]]['default'] = true; + } } // Get amenity filter data diff --git a/views/admin/shortcodes/index.html b/views/admin/shortcodes/index.html index 5dd8a007..096820b0 100644 --- a/views/admin/shortcodes/index.html +++ b/views/admin/shortcodes/index.html @@ -16,12 +16,12 @@ inserted into the shortcode. When including multiple attributes in a Shortcode, be sure to leave a space between the attributes. An example is shown below.

- 

[glm-members action="list" category="Accommodations"]

+ 

[glm-members-list category="11"]

- + - + - - + -
ShortcodeAttributeAttribute ValueDescription
ShortcodeAttributeDescription
[glm-members-list][glm-members-list] Displays a list of members and a map with markers for each member. Optionally, the attributes below may used to modify the display of this page. @@ -29,7 +29,7 @@
  + category="{ category ID(s) }" @@ -40,7 +40,7 @@
[glm-member-detail][glm-member-detail] Displays details for a speicif member along with a map showing their location. The "id" attribute below is required to specify which member to display. @@ -48,7 +48,7 @@
  + id="{ member ID }" diff --git a/views/front/members/detail.html b/views/front/members/detail.html index e7068f46..4957a741 100644 --- a/views/front/members/detail.html +++ b/views/front/members/detail.html @@ -53,8 +53,7 @@ {if $member.logo && $detail_show_logo}
- -
+
{else} @@ -74,18 +73,18 @@ {if $member.addr2}
{$member.addr2}
{/if} {/if} {if $list_show_citystatezip} - {if $member.city.name}{$member.city.name}{if $member.state.name}, {/if}{/if}{if $member.state.name}{$member.state.name}{/if}{if $member.zip} {$member.zip}{/if} + {if $member.city}{$member.city}{if $member.state.name}, {/if}{/if}{if $member.state.name}{$member.state.name}{/if}{if $member.zip} {$member.zip}{/if} {/if} {if $member.country.name && $list_show_country}
{$member.country.name}
{/if} {/if} {if $member.phone && $list_show_phone}
Phone: {$member.phone}
{/if} {if $member.toll_free && $list_show_tollfree}
Toll Free: {$member.toll_free}
{/if} - {if $member.region.value && $list_show_region}

Region: {$member.region.name}

{/if} + {if $member.region && $list_show_region}

Region: {$member.region}

{/if}

{if $member.url && $list_show_url}Website{/if} {if $member.email && $list_show_email}Email{/if} - {if $detail_show_imagegallery}Photo Gallery{/if} + {if $detail_show_imagegallery && $haveImageGallery}Photo Gallery{/if} {if $detail_show_coupons}Coupons{/if} {if $detail_show_packages}Packages{/if}
@@ -146,7 +145,7 @@ - {if $detail_show_imagegallery && $imagegallery} + {if $detail_show_imagegallery && $haveImageGallery}
@@ -167,7 +166,7 @@
{/if} - {if $detail_show_packages && $packages} + {if $detail_show_packages && $havePackages && $packages}
diff --git a/views/front/members/list.html b/views/front/members/list.html index 4a8c9805..a97b9da5 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -103,13 +103,13 @@ {if $m.addr2 && $list_show_addr2}
{$m.addr2}
{/if} {/if} {if $list_show_citystatezip} - {if $m.city.name}{$m.city.name}{if $m.state.name}, {/if}{/if}{if $m.state.name}{$m.state.name}{/if}{if $m.zip} {$m.zip}{/if} + {if $m.city}{$m.city}{if $m.state.name}, {/if}{/if}{if $m.state.name}{$m.state.name}{/if}{if $m.zip} {$m.zip}{/if} {/if} {if $m.country.name && $list_show_country}
{$m.country.name}
{/if} {/if} {if $m.phone && $list_show_phone}
Phone: {$m.phone}
{/if} {if $m.toll_free && $list_show_tollfree}
Toll Free: {$m.toll_free}
{/if} - {if $m.region.value && $list_show_region}

Region: {$m.region.name}

{/if} + {if $m.region && $list_show_region}

Region: {$m.region}

{/if}

{if $m.url && $list_show_url}Website{/if} @@ -187,7 +187,7 @@ {if $m.addr2}{$m.addr2}
{/if} {/if} {if $list_map_show_citystatezip} - {if $m.city.name}{$m.city.name}{if $m.state.name}, {/if}{/if}{if $m.state.name}{$m.state.name}{/if}{if $m.zip} {$m.zip}{/if} + {if $m.city}{$m.city}{if $m.state.name}, {/if}{/if}{if $m.state.name}{$m.state.name}{/if}{if $m.zip} {$m.zip}{/if} {/if} {if $m.country.name && $list_map_show_country}
{$m.country.name}{/if}

@@ -198,7 +198,7 @@ {if $m.toll_free && $list_map_show_tollfree}Toll Free: {$m.toll_free}
{/if} {if $m.url && $list_map_show_url}Web site: {$m.url}
{/if} {if $m.email && $list_map_show_email}E-Mail Address: {$m.email}
{/if} - {if $m.region.value && $list_map_show_region}Region: {$m.region.name}{/if} + {if $m.region && $list_map_show_region}Region: {$m.region}{/if}

{if $m.descr && $list_map_show_description}{$m.descr}
{/if} {if $m.short_descr && $list_map_show_short_descr}{$m.short_descr}
{/if} -- 2.17.1