AntonLV 12 лет назад
Родитель
Сommit
73c142d276

+ 2 - 2
modules/boonex/english/data/langs/system.xml

@@ -940,7 +940,7 @@
 	<string name="_adm_page_cpt_login"><![CDATA[Login]]></string>
 	<string name="_adm_page_cpt_polyglot"><![CDATA[Polyglot]]></string>
 	<string name="_adm_page_cpt_settings"><![CDATA[Settings]]></string>
-	<string name="_adm_page_cpt_store"><![CDATA[Store]]></string>
+	<string name="_adm_page_cpt_store"><![CDATA[Extensions]]></string>
 	<string name="_adm_pgt_btn_add_new_key"><![CDATA[Create New Key]]></string>
 	<string name="_adm_pgt_btn_delete"><![CDATA[Delete]]></string>
 	<string name="_adm_pgt_btn_delete_title"><![CDATA[Delete key]]></string>
@@ -1260,7 +1260,7 @@
 	<string name="_adm_wgt_cpt_designer"><![CDATA[Designer]]></string>
 	<string name="_adm_wgt_cpt_polyglot"><![CDATA[Polyglot]]></string>
 	<string name="_adm_wgt_cpt_settings"><![CDATA[Settings]]></string>
-	<string name="_adm_wgt_cpt_store"><![CDATA[Store]]></string>
+	<string name="_adm_wgt_cpt_store"><![CDATA[Extensions]]></string>
 	<string name="_are you sure?"><![CDATA[Are you sure?]]></string>
 	<string name="_bottom_text"><![CDATA[2002-{0}. Product of <a class="bottom_text" href="http://www.boonex.com/">BoonEx Group</a>.]]></string>
 	<string name="_cmt_block_comments_title"><![CDATA[Comments ({0})]]></string>

+ 11 - 0
studio/classes/BxDolStudioBuilderPageQuery.php

@@ -175,6 +175,17 @@ class BxDolStudioBuilderPageQuery extends BxDolStudioPageQuery
         return (int)$this->getOne("SELECT FOUND_ROWS()");
     }
 
+    function getModulesWithCopyableBlocks()
+    {
+    	$sSql = $this->prepare("SELECT
+				`tm`.`name` AS `module`
+			FROM `sys_modules` AS `tm`
+			LEFT JOIN `sys_pages_blocks` AS `tpb` ON `tm`.`name`=`tpb`.`module`
+			WHERE `tm`.`type`=? AND `tpb`.`copyable`=?
+			GROUP BY `tm`.`name`", BX_DOL_MODULE_TYPE_MODULE, 1);
+    	return $this->getColumn($sSql);
+    }
+
     function getBlocks($aParams, &$aItems, $bReturnCount = true)
     {
         $aMethod = array('name' => 'getAll', 'params' => array(0 => 'query'));

+ 4 - 1
studio/template/scripts/BxBaseStudioBuilderPage.php

@@ -594,10 +594,13 @@ class BxBaseStudioBuilderPage extends BxDolStudioBuilderPage
 
         bx_import('BxDolModuleQuery');
         $aModules = BxDolModuleQuery::getInstance()->getModulesBy(array('type' => 'modules'));
+        $aModulesWithBlocks = $this->oDb->getModulesWithCopyableBlocks();
         foreach($aModules as $aModule) {
         	$sName = $aModule['name'];
+        	if(!in_array($sName, $aModulesWithBlocks))
+        		continue;
 
-            if(!empty($aMenu[$aModule['name']]))
+            if(!empty($aMenu[$sName]))
                 $aMenu[$sName] = array_merge($aMenu[$sName], $aModule);
             else
                 $aMenu[$sName] = $aModule;