Changeset 12957

Timestamp:

Sep 25, 2009, 9:08:14 PM (13 years ago)

Author:

ShogoKawahara

Message:

#4330:fixed opMemberProfileForm and MemberProfileTable?, bacause it didn't filter members from all profiles on the pc_backend

Location:

OpenPNE3/trunk

Files:

• apps/pc_backend/modules/member/actions/actions.class.php (modified) (1 diff)
• lib/form/searchForm/opMemberProfileSearchForm.class.php (modified) (3 diffs)
• lib/model/doctrine/MemberProfileTable.class.php (modified) (2 diffs)

OpenPNE3/trunk/apps/pc_backend/modules/member/actions/actions.class.php

@@ -37 +37 @@
     $params = $request->getParameter('member', array());
 
-    $this->form = new opMemberProfileSearchForm(array(), array('use_id' => true));
+    $this->form = new opMemberProfileSearchForm(array(), array('use_id' => true, 'is_check_public_flag' => false));
     $this->form->bind($params);
 

OpenPNE3/trunk/lib/form/searchForm/opMemberProfileSearchForm.class.php

@@ -32 +32 @@
     $validators = array();
 
-    if ($this->getOption('use_id'))
+    if ($this->getOption('is_use_id'))
     {
       $widgets += array('id' => new sfWidgetFormInput());
@@ -106 +106 @@
     $q = Doctrine::getTable('Member')->createQuery();
 
-    if ($this->getOption('use_id'))
+    if ($this->getOption('is_use_id'))
     {
       $this->addIdColumnQuery($q, $this->getValue('id'));
@@ -141 +141 @@
     }
 
-    $ids = Doctrine::getTable('MemberProfile')->searchMemberIds($profileValues, $ids);
+    $ids = Doctrine::getTable('MemberProfile')->searchMemberIds($profileValues, $ids, $this->getOption('is_check_public_flag', true));
 
     if ($isWhere)

OpenPNE3/trunk/lib/model/doctrine/MemberProfileTable.class.php

@@ -79 +79 @@
   }
 
-  public function searchMemberIds($profile = array(), $ids = null)
+  public function searchMemberIds($profile = array(), $ids = null, $isCheckPublicFlag = true)
   {
     foreach ($profile as $key => $value)
@@ -128 +128 @@
       }
 
-      $ids = $this->filterMemberIdByProfile($ids, $column, $value, $item);
+      $publicFlag = ($isCheckPublicFlag) ? 1 : null;
+      $ids = $this->filterMemberIdByProfile($ids, $column, $value, $item, $publicFlag);
     }