Browse Source

Copyable flag for Navigation builder.

AntonLV 13 years ago
parent
commit
86894f8ccf

+ 2 - 1
install/sql/v70.sql

@@ -2824,6 +2824,7 @@ CREATE TABLE IF NOT EXISTS `sys_menu_items` (
   `submenu_object` varchar(32) NOT NULL,
   `visible_for_levels` int(11) NOT NULL DEFAULT '2147483647',
   `active` tinyint(4) NOT NULL DEFAULT '1',
+  `copyable` tinyint(4) NOT NULL DEFAULT '1',
   `order` int(11) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
@@ -2900,7 +2901,7 @@ INSERT INTO `sys_objects_grid` (`object`, `source_type`, `source`, `table`, `fie
 ('sys_studio_nav_menus', 'Sql', 'SELECT `tm`.*, `tms`.`title` AS `set_title`, `tmt`.`title` AS `template_title` FROM `sys_objects_menu` AS `tm` LEFT JOIN `sys_menu_sets` AS `tms` ON `tm`.`set_name`=`tms`.`set_name` LEFT JOIN `sys_menu_templates` AS `tmt` ON `tm`.`template_id`=`tmt`.`id` WHERE 1 ', 'sys_objects_menu', 'id', '', 'active', '', 100, NULL, 'start', '', '', 'tm`.`title,tms`.`title,tmt`.`title', 'auto', '', '', 'BxTemplStudioNavigationMenus', ''),
 ('sys_studio_nav_sets', 'Sql', 'SELECT * FROM `sys_menu_sets` WHERE 1 ', 'sys_menu_sets', 'set_name', '', '', '', 100, NULL, 'start', '', '', 'title', 'auto', '', '', 'BxTemplStudioNavigationSets', ''),
 ('sys_studio_nav_items', 'Sql', 'SELECT * FROM `sys_menu_items` WHERE 1 ', 'sys_menu_items', 'id', 'order', 'active', '', 100, NULL, 'start_it', '', 'link', 'title_system', 'like', '', '', 'BxTemplStudioNavigationItems', ''),
-('sys_studio_nav_import', 'Sql', 'SELECT * FROM `sys_menu_items` WHERE 1 ', 'sys_menu_items', 'id', '', '', '', 5, NULL, 'start_im', '', 'link', 'title_system', 'like', '', '', 'BxTemplStudioNavigationImport', ''),
+('sys_studio_nav_import', 'Sql', 'SELECT * FROM `sys_menu_items` WHERE 1 AND `copyable`=\'1\' ', 'sys_menu_items', 'id', '', '', '', 5, NULL, 'start_im', '', 'link', 'title_system', 'like', '', '', 'BxTemplStudioNavigationImport', ''),
 ('sys_studio_forms', 'Sql', 'SELECT * FROM `sys_objects_form` WHERE 1 ', 'sys_objects_form', 'id', 'module,title', 'active', '', 100, NULL, 'start', '', 'module', 'title', 'like', 'module', 'title', 'BxTemplStudioFormsForms', ''),
 ('sys_studio_forms_displays', 'Sql', 'SELECT `td`.`id` AS `id`, `td`.`object` AS `object`, `td`.`display_name` AS `display_name`, `td`.`title` AS `display_title`, `td`.`module` AS `module`, `tf`.`title` AS `form_title` FROM `sys_form_displays` AS `td` LEFT JOIN `sys_objects_form` AS `tf` ON `td`.`object`=`tf`.`object` WHERE 1 ', 'sys_form_displays', 'id', 'module,object,display_title', '', '', 100, NULL, 'start', '', 'td`.`module', 'td`.`title', 'like', 'module', 'display_title,form_title', 'BxTemplStudioFormsDisplays', ''),
 ('sys_studio_forms_fields', 'Sql', 'SELECT `tdi`.`id` AS `id`, `ti`.`caption_system` AS `caption_system`, `ti`.`type` AS `type`, `ti`.`module` AS `module`, `tdi`.`visible_for_levels` AS `visible_for_levels`, `tdi`.`active` AS `active`, `ti`.`editable` AS `editable`, `ti`.`deletable` AS `deletable`, `tdi`.`order` AS `order` FROM `sys_form_display_inputs` AS `tdi` LEFT JOIN `sys_form_inputs` AS `ti` ON `tdi`.`input_name`=`ti`.`name` AND `ti`.`object`=? WHERE 1 AND `tdi`.`display_name`=?', 'sys_form_display_inputs', 'id', 'order', 'active', '', 100, NULL, 'start', '', 'ti`.`type', 'ti`.`caption_system', 'like', '', '', 'BxTemplStudioFormsFields', ''),

+ 2 - 0
modules/boonex/developer/install/langs/en.xml

@@ -290,6 +290,8 @@
     <string name="_bx_dev_nav_txt_items_icon"><![CDATA[Icon]]></string>
     <string name="_bx_dev_nav_txt_sys_items_submenu_object"><![CDATA[Submenu Object]]></string>
     <string name="_bx_dev_nav_txt_items_submenu_object"><![CDATA[Submenu Object]]></string>
+    <string name="_bx_dev_nav_txt_sys_items_copyable"><![CDATA[Copyable]]></string>
+    <string name="_bx_dev_nav_txt_items_copyable"><![CDATA[Copyable]]></string>
     <string name="_bx_dev_nav_btn_sys_items_add"><![CDATA[Add]]></string>
     <string name="_bx_dev_nav_btn_items_add"><![CDATA[Add]]></string>
     <string name="_bx_dev_nav_btn_items_save"><![CDATA[Save]]></string>

+ 9 - 6
modules/boonex/developer/install/sql/install.sql

@@ -402,6 +402,7 @@ INSERT INTO `sys_form_inputs` (`object`, `module`, `name`, `value`, `values`, `c
 ('mod_dev_nav_item', @sName, 'target', '', '', 0, 'text', '_bx_dev_nav_txt_sys_items_target', '_bx_dev_nav_txt_items_target', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'icon', '', '', 0, 'text', '_bx_dev_nav_txt_sys_items_icon', '_bx_dev_nav_txt_items_icon', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'submenu_object', '', '', 0, 'text', '_bx_dev_nav_txt_sys_items_submenu_object', '_bx_dev_nav_txt_items_submenu_object', '', 0, 0, 0, '', '', '', '', '', '', 'Xss', '', 0, 0),
+('mod_dev_nav_item', @sName, 'copyable', '1', '', 0, 'checkbox', '_bx_dev_nav_txt_sys_items_copyable', '_bx_dev_nav_txt_items_copyable', '', 0, 0, 0, '', '', '', '', '', '', 'Int', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'controls', '', 'do_submit,cancel', 0, 'input_set', '', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'do_submit', '_bx_dev_nav_btn_items_add', '', 0, 'submit', '_bx_dev_nav_btn_sys_items_add', '', '', 0, 0, 0, '', '', '', '', '', '', '', '', 0, 0),
 ('mod_dev_nav_item', @sName, 'cancel', '_bx_dev_nav_btn_items_cancel', '', 0, 'button', '_bx_dev_nav_btn_sys_items_cancel', '', '', 0, 0, 0, 'a:2:{s:7:"onclick";s:45:"$(''.bx-popup-applied:visible'').dolPopupHide()";s:5:"class";s:22:"bx-def-margin-sec-left";}', '', '', '', '', '', '', '', 0, 0);
@@ -417,9 +418,10 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('mod_dev_nav_item_add', 'target', 2147483647, 1, 8),
 ('mod_dev_nav_item_add', 'icon', 2147483647, 1, 9),
 ('mod_dev_nav_item_add', 'submenu_object', 2147483647, 1, 10),
-('mod_dev_nav_item_add', 'controls', 2147483647, 1, 11),
-('mod_dev_nav_item_add', 'do_submit', 2147483647, 1, 12),
-('mod_dev_nav_item_add', 'cancel', 2147483647, 1, 13),
+('mod_dev_nav_item_add', 'copyable', 2147483647, 1, 11),
+('mod_dev_nav_item_add', 'controls', 2147483647, 1, 12),
+('mod_dev_nav_item_add', 'do_submit', 2147483647, 1, 13),
+('mod_dev_nav_item_add', 'cancel', 2147483647, 1, 14),
 ('mod_dev_nav_item_edit', 'id', 2147483647, 1, 1),
 ('mod_dev_nav_item_edit', 'module', 2147483647, 1, 2),
 ('mod_dev_nav_item_edit', 'set_name', 2147483647, 1, 3),
@@ -431,9 +433,10 @@ INSERT INTO `sys_form_display_inputs` (`display_name`, `input_name`, `visible_fo
 ('mod_dev_nav_item_edit', 'target', 2147483647, 1, 9),
 ('mod_dev_nav_item_edit', 'icon', 2147483647, 1, 10),
 ('mod_dev_nav_item_edit', 'submenu_object', 2147483647, 1, 11),
-('mod_dev_nav_item_edit', 'controls', 2147483647, 1, 12),
-('mod_dev_nav_item_edit', 'do_submit', 2147483647, 1, 13),
-('mod_dev_nav_item_edit', 'cancel', 2147483647, 1, 14);
+('mod_dev_nav_item_edit', 'copyable', 2147483647, 1, 12),
+('mod_dev_nav_item_edit', 'controls', 2147483647, 1, 13),
+('mod_dev_nav_item_edit', 'do_submit', 2147483647, 1, 14),
+('mod_dev_nav_item_edit', 'cancel', 2147483647, 1, 15);
 
 --
 -- Page Builder -> Page.

File diff suppressed because it is too large
+ 702 - 491
plugins/jquery/jquery.form.js


+ 1 - 0
studio/classes/BxDolStudioNavigationQuery.php

@@ -201,6 +201,7 @@ class BxDolStudioNavigationQuery extends BxDolDb {
 				`tmi`.`submenu_object` AS `submenu_object`,
                 `tmi`.`visible_for_levels` AS `visible_for_levels`,
                 `tmi`.`active` AS `active`,
+                `tmi`.`copyable` AS `copyable`,
                 `tmi`.`order` AS `order`" . $sSelectClause . "
             FROM `sys_menu_items` AS `tmi` " . $sJoinClause . "
             WHERE 1 " . $sWhereClause . " " . $sGroupClause . " " . $sOrderClause . " " . $sLimitClause;

Some files were not shown because too many files changed in this diff