Jelajahi Sumber

Ticket #2103 - Related changes in Core.

AntonLV 7 tahun lalu
induk
melakukan
7bace316c2

+ 18 - 1
modules/base/general/classes/BxBaseModGeneralGridAdministration.php

@@ -168,7 +168,24 @@ class BxBaseModGeneralGridAdministration extends BxTemplGrid
 		return $sLink;
     }
 
-	protected function _doDelete($iId, $aParams = array())
+    protected function _enable ($mixedId, $isChecked)
+    {
+        $CNF = &$this->_oModule->_oConfig->CNF;
+
+        $mixedResult = parent::_enable($mixedId, $isChecked);
+        if((int)$mixedResult > 0) {
+            if(!empty($CNF['FIELD_CHANGED']))
+                $this->_oModule->_oDb->updateEntriesBy(array($CNF['FIELD_CHANGED'] => time()), array($this->_aOptions['field_id'] => $mixedId));
+
+            $aContentInfo = $this->_oModule->_oDb->getContentInfoById($mixedId);
+
+            $this->_oModule->alertAfterEdit($aContentInfo);
+        }
+
+        return $mixedResult;
+    }
+
+    protected function _doDelete($iId, $aParams = array())
     {
     	return $this->_oModule->serviceDeleteEntity($iId) == '';
     }

+ 3 - 0
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -1103,6 +1103,9 @@ class BxBaseModGeneralModule extends BxDolModule
 
         $CNF = &$this->_oConfig->CNF;
 
+        if((!empty($CNF['FIELD_STATUS']) && $aContentInfo[$CNF['FIELD_STATUS']] != 'active') || (!empty($CNF['FIELD_STATUS_ADMIN']) && $aContentInfo[$CNF['FIELD_STATUS_ADMIN']] != 'active'))
+            return false;
+
         $iUserId = $this->getUserId();
         $iAuthorId = (int)$aContentInfo[$CNF['FIELD_AUTHOR']];
         $iAuthorIdAbs = abs($iAuthorId);