Merge branch 'master' of https://github.com/unaio/una

inc/classes/BxDolGridConnections.php

@@ -160,7 +160,7 @@ class BxDolGridConnections extends BxTemplGrid
             return $this->_bIsApi ? [] : '';
 
         if($this->_bIsApi)
-            return array_merge($a, ['name' => $sKey, 'type' => 'callback']);
+            return array_merge($a, ['name' => $sKey, 'type' => 'callback', 'on_callback' => 'hide']);
 
         return parent::_getActionDefault ($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);
     }
@@ -174,7 +174,7 @@ class BxDolGridConnections extends BxTemplGrid
             return $this->_bIsApi ? [] : '';
 
         if($this->_bIsApi)
-            return array_merge($a, ['name' => $sKey, 'type' => 'callback']);
+            return array_merge($a, ['name' => $sKey, 'type' => 'callback', 'on_callback' => 'hide']);
 
         return parent::_getActionDefault ($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);
     }

modules/base/general/classes/BxBaseModGeneralModule.php

@@ -591,6 +591,10 @@ class BxBaseModGeneralModule extends BxDolModule
     public function serviceGetSearchResultUnit ($iContentId, $sUnitTemplate = '')
     {
         $aContentInfo = $this->_oDb->getContentInfoById($iContentId);
+        if (bx_is_api())
+            return $this->decodeDataAPI($aContentInfo);
+        
+        
         if(empty($aContentInfo))
             return '';
 

modules/base/groups/classes/BxBaseModGroupsGridConnections.php

@@ -74,16 +74,25 @@ class BxBaseModGroupsGridConnections extends BxDolGridConnections
 
     public function performActionQuestionnaire()
     {
+       
         $CNF = &$this->_oModule->_oConfig->CNF;
 
         if(($mixedResult = $this->_oModule->checkAllowedManageAdmins($this->_iGroupProfileId)) !== CHECK_ACTION_RESULT_ALLOWED)
             return echoJson(['msg' => $mixedResult]);
 
         list($iId, $iViewedId) = $this->_prepareIds();
+        if($this->_bIsApi){
+            $iId = bx_get($CNF['FIELD_ID']);
+        }
         if(!$iId)
             return echoJson(['msg' => _t('_sys_txt_error_occured')]);
 
         $sPopupContent = $this->_oModule->_oTemplate->getPopupQuestionnaire($this->_aContentInfo[$CNF['FIELD_ID']], $iId);
+        
+        if($this->_bIsApi){
+             return [bx_api_get_block('simple_list',  $sPopupContent)];
+        }
+        
         if(!$sPopupContent)
             return echoJson([]);
 

modules/base/groups/classes/BxBaseModGroupsTemplate.php

@@ -99,6 +99,10 @@ class BxBaseModGroupsTemplate extends BxBaseModProfileTemplate
                 'question' => $aAnswer['question'],
                 'answer' => $aAnswer['answer'],
             ];
+        
+        if (bx_is_api()){
+            return $aTmplVarsAnswers;
+        }
 
         return $this->parseHtmlByName('popup_qnr_answers.html', ['bx_repeat:answers' => $aTmplVarsAnswers]);
     }

modules/boonex/events/classes/BxEventsTemplate.php

@@ -51,7 +51,7 @@ class BxEventsTemplate extends BxBaseModGroupsTemplate
         ]);
 
         if($this->_bIsApi)
-            return [bx_api_get_block('event_sessions',  $aTmplVarsSession)];
+            return [bx_api_get_block('simple_list',  $aTmplVarsSession)];
 
         return $s;
     }

template/scripts/BxBaseGrid.php

@@ -739,6 +739,8 @@ class BxBaseGrid extends BxDolGrid
         if(empty($this->_aOptions[$sActionsType]) || !is_array($this->_aOptions[$sActionsType]))
             return [];
 
+        
+        
         foreach ($this->_aOptions[$sActionsType] as $sKey => $aAction){
             $sFunc = '_getAction' . $this->_genMethodName($sType . '_' . $sKey);
             if (method_exists($this, $sFunc)){
@@ -756,7 +758,7 @@ class BxBaseGrid extends BxDolGrid
     protected function _getActionDelete($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array())
     {
         if($this->_bIsApi)
-            return array_merge($a, ['name' => $sKey, 'type' => 'callback']);
+            return array_merge($a, ['name' => $sKey, 'type' => 'callback', 'on_callback' => 'hide_row']);
 
     	return $this->_getActionDefault($sType, $sKey, $a, $isSmall, $isDisabled, $aRow);
     }