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

Ticket #4971 - Build-in API support: Menu persistent items.

romanlesnikov 1 год назад
Родитель
Сommit
e0f7c76c3d

+ 1 - 1
install/sql/system.sql

@@ -4890,7 +4890,7 @@ CREATE TABLE IF NOT EXISTS `sys_menu_items` (
   `config_api` text NOT NULL,
   `primary` tinyint(4) NOT NULL DEFAULT '0',
   `collapsed` tinyint(4) NOT NULL DEFAULT '0',
-  `persistant` tinyint(4) NOT NULL DEFAULT '0',
+  `persistent` tinyint(4) NOT NULL DEFAULT '0',
   `active` tinyint(4) NOT NULL DEFAULT '1',
   `active_api` tinyint(4) NOT NULL DEFAULT '0',
   `copyable` tinyint(4) NOT NULL DEFAULT '1',

+ 1 - 1
modules/boonex/english/data/langs/system/en.xml

@@ -1246,7 +1246,7 @@
 	<string name="_adm_nav_txt_all_modules"><![CDATA[All Modules]]></string>
         <string name="_adm_nav_txt_items_area_label"><![CDATA[Text for 'area-label' attribute]]></string>
         <string name="_adm_nav_txt_items_collapsed"><![CDATA[Collapsed]]></string>
-    <string name="_adm_nav_txt_items_persistant"><![CDATA[Persistant]]></string>
+    <string name="_adm_nav_txt_items_persistent"><![CDATA[Persistant]]></string>
     
 	<string name="_adm_nav_txt_items_create_popup"><![CDATA[Add New Item]]></string>
 	<string name="_adm_nav_txt_items_edit_popup"><![CDATA[Edit {0} Item]]></string>

+ 1 - 1
modules/boonex/russian/data/langs/system/ru.xml

@@ -1229,7 +1229,7 @@
 	<string name="_adm_nav_txt_all_modules"><![CDATA[Все модули]]></string>
         <string name="_adm_nav_txt_items_area_label"><![CDATA[Текст для атрибута 'area-label']]></string>
         <string name="_adm_nav_txt_items_collapsed"><![CDATA[Свёрнуто]]></string>
-    <string name="_adm_nav_txt_items_persistant"><![CDATA[Показывать постоянно]]></string>
+    <string name="_adm_nav_txt_items_persistent"><![CDATA[Показывать постоянно]]></string>
 	<string name="_adm_nav_txt_items_create_popup"><![CDATA[Добавить новый элемент]]></string>
 	<string name="_adm_nav_txt_items_edit_popup"><![CDATA[Редактировать {0} элемент]]></string>
 	<string name="_adm_nav_txt_items_gl_icon"><![CDATA[Иконка]]></string>

+ 4 - 4
studio/template/scripts/BxBaseStudioNavigationItems.php

@@ -843,13 +843,13 @@ class BxBaseStudioNavigationItems extends BxDolStudioNavigationItems
                         'pass' => 'Int',
                     )
                 ),
-                'persistant' => array(
+                'persistent' => array(
                     'type' => 'switcher',
-                    'name' => 'persistant',
-                    'caption' => _t('_adm_nav_txt_items_persistant'),
+                    'name' => 'persistent',
+                    'caption' => _t('_adm_nav_txt_items_persistent'),
                     'info' => '',
                     'value' => '1',
-                    'checked' => isset($aItem['persistant']) && (int)$aItem['persistant'] == 1,
+                    'checked' => isset($aItem['persistent']) && (int)$aItem['persistent'] == 1,
                     'db' => array (
                         'pass' => 'Int',
                     )

+ 1 - 0
template/scripts/BxBaseMenu.php

@@ -207,6 +207,7 @@ class BxBaseMenu extends BxDolMenu
                 'addon' => $this->_bDisplayAddons ? $this->_getMenuAddon($a) : '',
                 'config' => isset($a['config_api']) ? $a['config_api'] : '',
                 'primary' => isset($a['primary']) ? $a['primary'] : 0,
+                'persistent' => isset($a['persistent']) ? $a['persistent'] : 0,
             ];
 
             if(($aMarkers = $this->_getMenuMarkers($a)) && is_array($aMarkers))