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

Ticket #4971 - Build-in API support: Page content.

AntonLV 1 год назад
Родитель
Сommit
970d64d74f
2 измененных файлов с 11 добавлено и 4 удалено
  1. 5 3
      template/scripts/BxBasePage.php
  2. 6 1
      template/scripts/BxBaseServiceAccount.php

+ 5 - 3
template/scripts/BxBasePage.php

@@ -81,7 +81,7 @@ class BxBasePage extends BxDolPage
     }
     
     public function performActionGetShare ()
-    {
+    {p
         $aEmbedData = BxDolPage::getEmbedData(bx_get('url'));
         if(!isset($aEmbedData['url'])) 
             return; 
@@ -545,7 +545,6 @@ class BxBasePage extends BxDolPage
             'menu_bottom' => '',
             'menu_add' => '',
             'config' => $this->_aObject['config_api'],
-            'ts' => time(),
             'elements' => $this->getPageBlocksAPI($aBlocks),
         ];
 
@@ -715,7 +714,10 @@ class BxBasePage extends BxDolPage
         else if(!$bIsVisible)
             $a['page_status'] = 403;
 
-        return $a;
+        return array_merge($a, [
+            'version' => ($sVersion = bx_get_ver()) && $sVersion == BX_DOL_VERSION ? $sVersion : 'invalid',
+            'ts' => time()
+        ]);
     }
 
     public function getPageContentAPI($aBlocks = [])

+ 6 - 1
template/scripts/BxBaseServiceAccount.php

@@ -93,9 +93,14 @@ class BxBaseServiceAccount extends BxDol
                     $parts['query'] = http_build_query($query);
                     $sRedirectUrl = $parts['path'] . (!empty($parts['query']) ? '?' . $parts['query'] : '');
                 }
+
                 return [
+                    bx_api_get_block('form', $this->_oAccountForms->getObjectFormAdd()->getCodeAPI(), [
+                        'ext' => [
+                            'request' => ['url' => '/api.php?r=system/create_account_form/TemplServiceAccount', 'immutable' => true]
+                        ]
+                    ]),
                     bx_api_get_block('redirect', ['uri' => $sRedirectUrl]),
-                    //bx_api_get_block('login', ['session' => BxDolSession::getInstance()->getId()], ['id' => 2]),
                 ];
             }
             else