1
0
Эх сурвалжийг харах

Ticket #4971 - Build-in API support: Bento Grid.

AntonLV 6 сар өмнө
parent
commit
987a64b7cc

+ 3 - 4
inc/classes/BxDolPage.php

@@ -721,19 +721,18 @@ class BxDolPage extends BxDolFactory implements iBxDolFactoryObject, iBxDolRepla
         $sData = $oDb->getPageBlockData($iBlockId, $iContentId, $sContentModule);
         $aData = !empty($sData) ? json_decode($sData, true) : [];
 
-        $oEmbed = BxDolEmbed::getObjectInstance('sys_system');
-
         foreach($aData as &$j) {
             foreach($j as &$k) {
                 switch($k['type']) {
                     case 'image':
                         $aImage = bx_api_get_image(['sys_images_editor', 'sys_images_editor'], (int)$k['content']);
                         if($aImage && is_array($aImage))
-                            $k['content'] = $aImage['src'];
+                            $k['content'] = $aImage;
                         break;
 
                     case 'link':
-                        $k['content_data'] = $oEmbed->getData($k['content'], '');
+                        if(($oEmbed = BxDolEmbed::getObjectInstance('sys_system')) !== false)
+                            $k['content_data'] = $oEmbed->getData($k['content'], '');
                         break;
                 }
             }

+ 5 - 0
template/scripts/BxBaseServicePages.php

@@ -142,6 +142,11 @@ class BxBaseServicePages extends BxDol
         return BxDolPage::setPageBlockData($iBlockId, $iContentId, $sContentModule, $sData);
     }
 
+    public function serviceGetPageBlockImageData($iImageId)
+    {
+        return bx_api_get_image(['sys_images_editor', 'sys_images_editor'], (int)$iImageId);
+    }
+
     public function serviceGetUrlInfo($sUrl)
     {
         $oEmbed = BxDolEmbed::getObjectInstance('sys_system');

+ 1 - 0
template/scripts/BxBaseServices.php

@@ -54,6 +54,7 @@ class BxBaseServices extends BxDol implements iBxDolProfileService
             'GetPageContentByRequest' => 'BxBaseServicePages',
             'GetPageBlockData' => 'BxBaseServicePages',
             'SetPageBlockData' => 'BxBaseServicePages',
+            'GetPageBlockImageData' => 'BxBaseServicePages',
             'GetUrlInfo' => 'BxBaseServicePages',
 
             'CreateAccountForm' => 'BxBaseServiceAccount',