Răsfoiți Sursa

Ticket #5688 - Improve JS 'bx_alert' to have a lite version without [OK] confirmation. Usage in Developer.

AntonLV 3 săptămâni în urmă
părinte
comite
dd417b70c0

+ 2 - 6
modules/boonex/developer/classes/BxDevPolyglotManage.php

@@ -102,16 +102,12 @@ class BxDevPolyglotManage extends BxTemplStudioGrid
 
     public function performActionRecompile()
     {
-        $aResult = array('msg' => _t(BxDolStudioLanguagesUtils::getInstance()->compileLanguage() ? '_adm_pgt_scs_recompiled' : '_adm_pgt_err_cannot_recompile_lang'));
-
-        echoJson($aResult);
+        echoJson(BxDolStudioLanguagesUtils::getInstance()->compileLanguage() ? ['toast' => _t('_adm_pgt_scs_recompiled')] : ['msg' => _t('_adm_pgt_err_cannot_recompile_lang')]);
     }
 
     public function performActionRestore()
     {
-        $aResult = array('msg' => _t(BxDolStudioLanguagesUtils::getInstance()->restoreLanguage() ? '_adm_pgt_scs_restored' : '_adm_pgt_err_cannot_restore_lang'));
-
-        echoJson($aResult);
+        echoJson(BxDolStudioLanguagesUtils::getInstance()->restoreLanguage() ? ['toast' => _t('_adm_pgt_scs_restored')] : ['msg' => _t('_adm_pgt_err_cannot_restore_lang')]);
     }
 
     protected function _getCellDefault($mixedValue, $sKey, $aField, $aRow)

+ 6 - 2
modules/boonex/developer/js/polyglot.js

@@ -36,8 +36,12 @@ BxDevPolyglot.prototype.perform = function(sAction, sLanguage, sModule) {
         function(oData) {
         	bx_loading($('body'), false);
 
-        	if(oData.content)
-        		bx_alert(oData.content);
+        	if(oData.code !== undefined && oData.content) {
+                if(parseInt(oData.code) == 0)
+                    bx_toast(oData.content);
+                else
+                    bx_alert(oData.content);
+            }
         },
         'json'
     );