Ticket #3462

modules/base/general/classes/BxBaseModGeneralGridAdministration.php

@@ -13,27 +13,32 @@ define('BX_DOL_MANAGE_TOOLS_COMMON', 'common');
 
 class BxBaseModGeneralGridAdministration extends BxTemplGrid
 {
-	protected $MODULE;
-	protected $_oModule;
+    protected $MODULE;
+    protected $_oModule;
 
-	protected $_sManageType;
-	protected $_sParamsDivider;
+    protected $_sManageType;
+    protected $_sParamsDivider;
+
+    protected $_sStatusField;
+    protected $_aStatusValues;
 
     public function __construct ($aOptions, $oTemplate = false)
     {
     	$this->_oModule = BxDolModule::getInstance($this->MODULE);
     	if(!$oTemplate)
-			$oTemplate = $this->_oModule->_oTemplate;
+            $oTemplate = $this->_oModule->_oTemplate;
 
         parent::__construct ($aOptions, $oTemplate);
 
         $this->_sManageType = BX_DOL_MANAGE_TOOLS_ADMINISTRATION;
         $this->_sParamsDivider = '#-#';
 
+        $this->_aStatusValues = array('active');
+
         $this->_sDefaultSortingOrder = 'DESC';
     }
 
-	public function performActionDelete($aParams = array())
+    public function performActionDelete($aParams = array())
     {
     	$CNF = &$this->_oModule->_oConfig->CNF;
 
@@ -259,10 +264,10 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
     {
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        if(isset($CNF['FIELD_STATUS']) && isset($aRow[$CNF['FIELD_STATUS']]) && !in_array($aRow[$CNF['FIELD_STATUS']], array('active', 'hidden'))) {
-            $sStatusKey = '_sys_status_' . $aRow[$CNF['FIELD_STATUS']];
-            if(!empty($CNF['T']['txt_status_' . $aRow[$CNF['FIELD_STATUS']]]))
-                $sStatusKey = $CNF['T']['txt_status_' . $aRow[$CNF['FIELD_STATUS']]];
+        if(isset($aRow[$this->_sStatusField]) && !in_array($aRow[$this->_sStatusField], $this->_aStatusValues)) {
+            $sStatusKey = '_sys_status_' . $aRow[$this->_sStatusField];
+            if(!empty($CNF['T']['txt_status_' . $aRow[$this->_sStatusField]]))
+                $sStatusKey = $CNF['T']['txt_status_' . $aRow[$this->_sStatusField]];
 
             return parent::_getCellDefault(_t($sStatusKey), $sKey, $aField, $aRow);
         }

modules/base/profile/classes/BxBaseModProfileGridAdministration.php

@@ -11,9 +11,9 @@
 
 class BxBaseModProfileGridAdministration extends BxBaseModGeneralGridAdministration
 {
-	protected $_sFilter1Name;
-	protected $_sFilter1Value;
-	protected $_aFilter1Values;
+    protected $_sFilter1Name;
+    protected $_sFilter1Value;
+    protected $_aFilter1Values;
 
     public function __construct ($aOptions, $oTemplate = false)
     {
@@ -23,12 +23,15 @@ class BxBaseModProfileGridAdministration extends BxBaseModGeneralGridAdministrat
 
         $this->_aQueryReset = array('order_field', 'order_dir', $this->_aOptions['paginate_get_start'], $this->_aOptions['paginate_get_per_page']);
 
+        $this->_sStatusField = $CNF['FIELD_STATUS'];
+        $this->_aStatusValues = array('active', 'pending', 'suspended');
+
         $this->_sFilter1Name = 'filter1';
         $this->_aFilter1Values = array(
-			'active' => $CNF['T']['filter_item_active'],
+            'active' => $CNF['T']['filter_item_active'],
             'pending' => $CNF['T']['filter_item_pending'],
             'suspended' => $CNF['T']['filter_item_suspended'],
-		);
+        );
 
     	$sFilter1 = bx_get($this->_sFilter1Name);
         if(!empty($sFilter1)) {

modules/base/text/classes/BxBaseModTextGridAdministration.php

@@ -11,7 +11,6 @@
 
 class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
 {
-    protected $_sFieldStatus;
     protected $_sFilter1Name;
     protected $_sFilter1Value;
     protected $_aFilter1Values;
@@ -22,7 +21,8 @@ class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        $this->_sFieldStatus = $CNF['FIELD_STATUS_ADMIN'];
+        $this->_sStatusField = $CNF['FIELD_STATUS_ADMIN'];
+        $this->_aStatusValues = array('active', 'hidden', 'pending');
 
         $this->_sFilter1Name = 'filter1';
         $this->_aFilter1Values = array(
@@ -55,7 +55,7 @@ class BxBaseModTextGridAdministration extends BxBaseModGeneralGridAdministration
             list($this->_sFilter1Value, $sFilter) = explode($this->_sParamsDivider, $sFilter);
 
     	if(!empty($this->_sFilter1Value))
-        	$this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `" . $this->_sFieldStatus . "`=?", $this->_sFilter1Value);
+        	$this->_aOptions['source'] .= $this->_oModule->_oDb->prepareAsString(" AND `" . $this->_sStatusField . "`=?", $this->_sFilter1Value);
 
         return parent::_getDataSql($sFilter, $sOrderField, $sOrderDir, $iStart, $iPerPage);
     }

modules/base/text/classes/BxBaseModTextGridCommon.php

@@ -17,7 +17,8 @@ class BxBaseModTextGridCommon extends BxBaseModTextGridAdministration
 
         $CNF = &$this->_oModule->_oConfig->CNF;
 
-        $this->_sFieldStatus = $CNF['FIELD_STATUS'];
+        $this->_sStatusField = $CNF['FIELD_STATUS'];
+        $this->_aStatusValues = array('active', 'hidden');
 
         if($this->_oModule->_oConfig->isAutoApprove() && isset($this->_aFilter1Values[BX_BASE_MOD_TEXT_STATUS_PENDING]))
             unset($this->_aFilter1Values[BX_BASE_MOD_TEXT_STATUS_PENDING]);

modules/boonex/english/data/langs/system/en.xml

@@ -3216,6 +3216,8 @@ If it is not enabled then please consider implement this optimization, since it
         <string name="_sys_status"><![CDATA[Status]]></string>
         <string name="_sys_status_awaiting"><![CDATA[awaiting]]></string>
         <string name="_sys_status_failed"><![CDATA[failed]]></string>
+        <string name="_sys_status_pending"><![CDATA[pending]]></string>
+        <string name="_sys_status_suspended"><![CDATA[suspended]]></string>
 	<string name="_sys_storage_err_db"><![CDATA[database error]]></string>
 	<string name="_sys_storage_err_engine_add"><![CDATA[error occurred]]></string>
 	<string name="_sys_storage_err_engine_get"><![CDATA[error occurred]]></string>

modules/boonex/russian/data/langs/system/ru.xml

@@ -3196,6 +3196,8 @@
         <string name="_sys_status"><![CDATA[Статус]]></string>
         <string name="_sys_status_awaiting"><![CDATA[ожидающий]]></string>
         <string name="_sys_status_failed"><![CDATA[неудавшийся]]></string>
+        <string name="_sys_status_pending"><![CDATA[ожидающий]]></string>
+        <string name="_sys_status_suspended"><![CDATA[заблокированный]]></string>
 	<string name="_sys_storage_err_db"><![CDATA[ошибка базы данных]]></string>
 	<string name="_sys_storage_err_engine_add"><![CDATA[произошла ошибка]]></string>
 	<string name="_sys_storage_err_engine_get"><![CDATA[произошла ошибка]]></string>