Просмотр исходного кода

Ticket #5298 - Resources module. Core changes.

AntonLV 10 месяцев назад
Родитель
Сommit
cad80cc685

+ 21 - 1
modules/base/general/classes/BxBaseModGeneralTemplate.php

@@ -160,7 +160,7 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
         return $sResult;
     }
 
-    protected function getSummary($aData, $sTitle = '', $sText = '', $sUrl = '')
+    public function getSummary($aData, $sTitle = '', $sText = '', $sUrl = '')
     {
         $sAbstract = $this->getAbstract($aData);
         if(!empty($sAbstract))
@@ -175,6 +175,26 @@ class BxBaseModGeneralTemplate extends BxDolModuleTemplate
         return strmaxtextlen($sText, (int)getParam($CNF['PARAM_CHARS_SUMMARY']), $sLinkMore);
     }
 
+    public function getUnitLink ($aData, $aParams = [])
+    {
+        return $this->_oConfig->getViewEntryUrl($aData);
+    }
+
+    public function getUnitTitle ($aData, $aParams = [])
+    {
+        return $this->getTitle($aData, $aParams['process_output'] ?? null);
+    }
+
+    public function getUnitText ($aData, $aParams = [])
+    {
+        return $this->getText($aData, $aParams['process_output'] ?? null);
+    }
+
+    public function getUnitSummary ($aData, $sTitle = '', $sText = '', $sUrl = '')
+    {
+        return $this->getSummary($aData, $sTitle, $sText, $sUrl);
+    }
+
     public function getProfileLink($mixedProfile)
     {
     	if(!is_array($mixedProfile))

+ 7 - 9
modules/base/text/classes/BxBaseModTextTemplate.php

@@ -228,7 +228,7 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
         ]));
     }
 
-    public function getEventLinks($iContentId)
+    public function getAttachLinks($iContentId)
     {
         $CNF = &$this->getModule()->_oConfig->CNF;
         
@@ -345,7 +345,7 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
         );
 
         $aTmplVarsLinks = [];
-        if(isset($CNF['FIELD_LINK']) && ($aLinks = $this->getEventLinks($aData[$CNF['FIELD_ID']])))
+        if(isset($CNF['FIELD_LINK']) && ($aLinks = $this->getAttachLinks($aData[$CNF['FIELD_ID']])))
             $aTmplVarsLinks = $this->getTmplVarsAttachedLinks($aLinks);
 
         $aVars['bx_if:show_links'] = [
@@ -490,14 +490,12 @@ class BxBaseModTextTemplate extends BxBaseModGeneralTemplate
             }
         }
 
-        // get entry url
-        $sUrl = $this->_oConfig->getViewEntryUrl($aData[$CNF['FIELD_ID']]);
-
         $oProfile = BxDolProfile::getInstanceMagic($aData[$CNF['FIELD_AUTHOR']]);
-        
-        $sTitle = $this->getTitle($aData);
-        $sText = $this->getText($aData);
-        $sSummary = $this->getSummary($aData, $sTitle, $sText, $sUrl);
+
+        $sUrl = $this->getUnitLink($aData);
+        $sTitle = $this->getUnitTitle($aData);
+        $sText = $this->getUnitText($aData);
+        $sSummary = $this->getUnitSummary($aData, $sTitle, $sText, $sUrl);
         $sSummaryPlain = isset($CNF['PARAM_CHARS_SUMMARY_PLAIN']) && $CNF['PARAM_CHARS_SUMMARY_PLAIN'] ? BxTemplFunctions::getInstance()->getStringWithLimitedLength(strip_tags($sSummary), (int)getParam($CNF['PARAM_CHARS_SUMMARY_PLAIN'])) : '';
 
         if(!empty($CNF['OBJECT_METATAGS'])) {

+ 1 - 1
modules/boonex/polls/classes/BxPollsTemplate.php

@@ -164,7 +164,7 @@ class BxPollsTemplate extends BxBaseModTextTemplate
         return $sResult;
     }
 
-    protected function getSummary($aData, $sTitle = '', $sText = '', $sUrl = '')
+    public function getSummary($aData, $sTitle = '', $sText = '', $sUrl = '')
     {
         $oModule = $this->getModule();
         $CNF = &$oModule->_oConfig->CNF;