فهرست منبع

Ticket #2176 - Dynamic submit.

AntonLV 7 سال پیش
والد
کامیت
acb4720a11

+ 2 - 6
modules/base/general/classes/BxBaseModGeneralFormsEntryHelper.php

@@ -46,11 +46,6 @@ class BxBaseModGeneralFormsEntryHelper extends BxDolProfileForms
         	$this->setDynamicMode(true);
     }
 
-    public function isAjaxMode()
-    {
-        return $this->_bAjaxMode;
-    }
-
     public function setDynamicMode($bDynamicMode)
     {
         $this->_bDynamicMode = (bool)$bDynamicMode;
@@ -521,7 +516,8 @@ class BxBaseModGeneralFormsEntryHelper extends BxDolProfileForms
             return $mixedResponse;
 
         $aResponse = array(
-            $sKey => $mixedResponse
+            $sKey => $mixedResponse,
+            '_dt' => 'json'
         );
 
         if(!empty($aAdditional) && is_array($aAdditional))

+ 5 - 4
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -506,11 +506,12 @@ class BxBaseModGeneralModule extends BxDolModule
             $oFormsHelper->setDynamicMode($sParams['dynamic_mode']);
 
         $mixedResult = $oFormsHelper->addDataForm($sDisplay);
-        if(!$oFormsHelper->isAjaxMode())
-            return $mixedResult;
+        if(isset($mixedResult['_dt']) && $mixedResult['_dt'] == 'json') {
+            echoJson($mixedResult);
+            exit;
+        }
 
-        echoJson($mixedResult);
-        exit;
+        return $mixedResult;
     }
 
     public function serviceEntityEdit ($iContentId = 0, $sDisplay = false)