Fixed problems caused by updates to the Data Abstract.

diff --git a/classes/data/dataCategoryMemberInfo.php b/classes/data/dataCategoryMemberInfo.php
index 0f81413..5cfeb56 100644 (file)
--- a/classes/data/dataCategoryMemberInfo.php
+++ b/classes/data/dataCategoryMemberInfo.php
@@ -165,7 +165,8 @@ class GlmDataCategoryMemberInfo extends GlmDataAbstract
      * @access public
      */
 
-    public function getListWithParents($memberInfoID = false, $category = false) {
+    public function getListWithParents($memberInfoID = false, $category = false)
+    {
 
         $where = '';
 
@@ -221,7 +222,8 @@ class GlmDataCategoryMemberInfo extends GlmDataAbstract
      * @access public
      */
 
-    public function setMemberInfoCategories($memberInfoID, $selectedCategories) {
+    public function setMemberInfoCategories($memberInfoID, $selectedCategories)
+    {
 
         // Check supplied data
         if (!is_int($memberInfoID) || $memberInfoID <=0 || !is_array($selectedCategories) || count($selectedCategories) == 0 ) {
@@ -229,7 +231,7 @@ class GlmDataCategoryMemberInfo extends GlmDataAbstract
         }
 
         // Get current list
-        $current = $this->getList($memberInfoID);
+        $current = $this->getList("T.member_info = $memberInfoID");
 
         // If we have any currently selected categories
         if (is_array($current) && count($current) > 0) {
@@ -306,7 +308,8 @@ class GlmDataCategoryMemberInfo extends GlmDataAbstract
      * @access public
      */
 
-    public function clearMemberInfoCategories($memberInfoID) {
+    public function clearMemberInfoCategories($memberInfoID)
+    {
 
         $sql = "
             DELETE FROM ".GLM_MEMBERS_PLUGIN_DB_PREFIX."category_member_info

diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php
index ed4e18d..58953ab 100644 (file)
--- a/classes/data/dataMemberInfo.php
+++ b/classes/data/dataMemberInfo.php
@@ -155,7 +155,6 @@ class GlmDataMemberInfo extends GlmDataAbstract
                                        'list' => $this->config['status'],
                                        'required' => true,
                                        'default' => $this->config['status_numb']['Pending'],
-//                                     'force_list' => true,
                                        'use' => 'a'
                                ),
 
@@ -209,7 +208,6 @@ class GlmDataMemberInfo extends GlmDataAbstract
                             'p_field' => 'name',
                             'p_orderby' => 'name',
                                    'p_blank' => true,
-//                             'force_list' => true,
                                'use' => 'a'
                        ),
 
@@ -219,7 +217,6 @@ class GlmDataMemberInfo extends GlmDataAbstract
                                        'type' => 'list',
                                        'list' => $this->config['states'],
                                        'default' => 'MI',
-//                                     'force_list' => true,
                                        'use' => 'a'
                                ),
 
@@ -236,7 +233,6 @@ class GlmDataMemberInfo extends GlmDataAbstract
                                'type' => 'list',
                                'list' => $this->config['countries'],
                                'default' => 'US',
-//                             'force_list' => true,
                                'use' => 'a'
                        ),
 

diff --git a/lib/GlmDataAbstract/DataAbstract.php b/lib/GlmDataAbstract/DataAbstract.php
index 56802f2..a01300e 100755 (executable)
--- a/lib/GlmDataAbstract/DataAbstract.php
+++ b/lib/GlmDataAbstract/DataAbstract.php
@@ -585,7 +585,7 @@ abstract class GlmDataAbstract
         $alwaysList = (isset($f['force_list']) && $f['force_list']);
         $pStatic = (isset($f['p_static']) && $f['p_static']);
         $pSum = (isset($f['p_sum']) && $f['p_sum']);
-        if (($alwaysList || $forEdit || $pSum) && !$pStatic ) {
+        if (($this->optionIncludeSelectListData || $alwaysList || $forEdit || $pSum) && !$pStatic ) {
 
             $p_value = $d;
 
@@ -649,7 +649,7 @@ abstract class GlmDataAbstract
                     reset($p_list);
                     foreach ($p_list as $p) {
 
-                       if ($this->optionIncludeSelectListData) {
+                        if ($this->optionIncludeSelectListData) {
                            $pick_list[$p['p_id']] = array(
                                    'value'   => $p['p_id'],
                                    'name'    => $p['p_value'],
@@ -947,7 +947,7 @@ abstract class GlmDataAbstract
 
        // if the list is not required, dump it now. (List, Get, Delete, Confirm delete)
        $forceList = (isset($f['force_list']) && $f['force_list']);
-        if (!$forceList && !$forEdit && in_array($op, array('l', 'g', 'd', 'c'))) {
+        if (!$this->optionIncludeSelectListData && !$forceList && !$forEdit && in_array($op, array('l', 'g', 'd', 'c'))) {
                $r['list'] = false;
         }
 

diff --git a/models/admin/member/memberInfo.php b/models/admin/member/memberInfo.php
index 0867b34..bab96bb 100644 (file)
--- a/models/admin/member/memberInfo.php
+++ b/models/admin/member/memberInfo.php
@@ -218,6 +218,8 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
     public function modelAction ($actionData = false)
     {
 
+        $this->optionIncludeSelectListData = true;
+
         // Check for action option - Should be one of the values in the "switch" statement below
         $option = false;
         if (isset($_REQUEST['option']) && trim($_REQUEST['option']) != '') {
@@ -266,9 +268,6 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
         // Determine if the current member info record active?
         $this->isActive = $this->isActive();
 
-        // Check for new cities being submitted
-        $this->checkNewCities();
-
         // Get member base data
         require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php');
         $Members = new GlmDataMembers($this->wpdb, $this->config);
@@ -300,6 +299,9 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
             // Process submission of a member information record update
             case 'submit':
 
+                // Check for new cities being submitted
+                $this->checkNewCities();
+
                 // Update submitted categories
                 $this->updateCategories();
 
@@ -316,7 +318,8 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
                 if ($this->haveMemberInfo) {
 
                     // Update the member Info data
-                    $this->memberInfo = $this->updateEntry($this->memberInfoID);
+
+                    $this->memberInfo = $this->updateEntry($this->memberInfoID, 'id', true, true);
 
                     break;
                 } else {
@@ -340,6 +343,9 @@ class GlmMembersAdmin_member_memberInfo extends GlmDataMemberInfo
                     $this->memberInfoID = $this->memberInfo['fieldData']['id'];
                     $this->haveMemberInfo = true;
 
+                    // Check for new cities being submitted
+                    $this->checkNewCities();
+
                     // Update submitted categories
                     $this->updateCategories();