فهرست منبع

Ticket #833 - point 4

AntonLV 9 سال پیش
والد
کامیت
b111d0b89d
3فایلهای تغییر یافته به همراه25 افزوده شده و 1 حذف شده
  1. 8 0
      inc/classes/BxDolAcl.php
  2. 14 0
      inc/classes/BxDolAclQuery.php
  3. 3 1
      template/scripts/BxBaseMenuSetAclLevel.php

+ 8 - 0
inc/classes/BxDolAcl.php

@@ -405,6 +405,14 @@ class BxDolAcl extends BxDolFactory implements iBxDolSingleton
         return $aLevels;
     }
 
+    function getMembershipsBy($aParams)
+    {
+        $aLevels = array();
+        $this->oDb->getLevels($aParams, $aLevels, false);
+
+        return $aLevels;
+    }
+
     /**
      * Get info about a given membership
      *

+ 14 - 0
inc/classes/BxDolAclQuery.php

@@ -78,6 +78,20 @@ class BxDolAclQuery extends BxDolDb implements iBxDolSingleton
                 $sWhereClause .= "AND `tal`.`Active`='yes'";
                 break;
 
+            case 'all_active_not_automatic_pair':
+                $aMethod['name'] = "getPairs";
+                $aMethod['params'][1] = 'id';
+                $aMethod['params'][2] = 'name';
+                $sWhereClause .= "AND `tal`.`Active`='yes' AND `tal`.`ID` NOT IN (" . $this->implode_escape(array(
+                    MEMBERSHIP_ID_NON_MEMBER,
+                    MEMBERSHIP_ID_ACCOUNT,
+                    MEMBERSHIP_ID_UNCONFIRMED,
+                    MEMBERSHIP_ID_PENDING,
+                    MEMBERSHIP_ID_SUSPENDED
+                    
+                )) . ")";
+                break;
+
             case 'all_pair':
                 $aMethod['name'] = "getPairs";
                 $aMethod['params'][1] = 'id';

+ 3 - 1
template/scripts/BxBaseMenuSetAclLevel.php

@@ -58,7 +58,9 @@ class BxBaseMenuSetAclLevel extends BxTemplMenu
 			$this->setSelected('', $aProfileAclLevel['id']);
 		}
 
-		$aAclLevels = $oAcl->getMemberships(false, true);
+		$aAclLevels = $oAcl->getMembershipsBy(array('type' => 'all_active_not_automatic_pair'));
+		foreach ($aAclLevels as $k => $s)
+            $aAclLevels[$k] = _t($s);
 
         $aItems = array();
         foreach ($aAclLevels as $iId => $sTitle) {