Changeset 15924 for trunk

Timestamp:

01/25/12 01:10:45 (4 months ago)

Author:

Alexander Trofimov

Message:

Typo: deleteable -> deletable

Location:

trunk

Files:

• inc/classes/BxDolMenu.php (modified) (1 diff)
• install/sql/v70.sql (modified) (3 diffs)
• modules/boonex/groups/install/sql/enable.sql (modified) (2 diffs)
• samples/BxSampleForm.php (modified) (1 diff)
• studio/classes/BxDolStudioFormsQuery.php (modified) (1 diff)
• studio/classes/BxDolStudioNavigationQuery.php (modified) (1 diff)
• studio/templates/base/scripts/BxBaseStudioNavigationMenus.php (modified) (3 diffs)

trunk/inc/classes/BxDolMenu.php

@@ -35 +35 @@
  * - module: the module this menu belongs to.
  * - template_id: the template to use for menu displaying, this is id from 'sys_menu_templates' table.
- * - deleteable: it determines if menu can be deleted from the studio menu builder.
+ * - deletable: it determines if menu can be deleted from the studio menu builder.
  * - active: it is possible to disable particular menu, then it will not be displayed.
  * - override_class_name: user defined class name which is derived from BxTemplMenu.

trunk/install/sql/v70.sql

@@ -3989 +3989 @@
   `uri_title` varchar(255) NOT NULL,
   `params` text NOT NULL,
-  `deleteable` tinyint(4) NOT NULL DEFAULT '1',
+  `deletable` tinyint(4) NOT NULL DEFAULT '1',
   `active` tinyint(4) NOT NULL DEFAULT '0',
   `override_class_name` varchar(255) NOT NULL,
@@ -4513 +4513 @@
   `module` varchar(32) NOT NULL,
   `template_id` int(11) NOT NULL,
-  `deleteable` tinyint(4) NOT NULL DEFAULT '1',
+  `deletable` tinyint(4) NOT NULL DEFAULT '1',
   `active` tinyint(4) NOT NULL DEFAULT '0',
   `override_class_name` varchar(255) NOT NULL,
@@ -4521 +4521 @@
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
 
-INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deleteable`, `active`, `override_class_name`, `override_class_file`) VALUES
+INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES
 ('sys_site', '_sys_menu_title_main', 'sys_site', 'system', 1, 0, 1, '', ''),
 ('sys_footer', '_sys_menu_title_footer', 'sys_footer', 'system', 2, 0, 1, '', '');

trunk/modules/boonex/groups/install/sql/enable.sql

@@ -93 +93 @@
 -- groups menu 
 
-INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deleteable`, `active`, `override_class_name`, `override_class_file`) VALUES
+INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES
 ('bx_groups', '_bx_groups_menu_title_main', 'bx_groups', 'bx_groups', 1, 0, 1, '', '');
 
@@ -112 +112 @@
 -- group view menu 
 
-INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deleteable`, `active`, `override_class_name`, `override_class_file`) VALUES
+INSERT INTO `sys_objects_menu` (`object`, `title`, `set_name`, `module`, `template_id`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES
 ('bx_groups_view', '_bx_groups_menu_title_group_view', 'bx_groups_view', 'bx_groups', 1, 0, 1, '', '');
 

trunk/samples/BxSampleForm.php

@@ -39 +39 @@
 -- SQL dump of form object:
 
-INSERT INTO `sys_objects_form` (`object`, `title`, `action`, `form_attrs`, `submit_name`, `table`, `key`, `uri`, `uri_title`, `params`, `deleteable`, `active`, `override_class_name`, `override_class_file`) VALUES
+INSERT INTO `sys_objects_form` (`object`, `title`, `action`, `form_attrs`, `submit_name`, `table`, `key`, `uri`, `uri_title`, `params`, `deletable`, `active`, `override_class_name`, `override_class_file`) VALUES
 ('sample_form_objects', 'Sample Form Object', 'samples/form_objects.php', '', 'do_submit', 'sample_input_types', 'id', '', '', 'a:1:{s:14:"checker_helper";s:25:"BxSampleFormCheckerHelper";}', 1, 1, 'BxSampleForm', 'samples/BxSampleForm.php');
 

trunk/studio/classes/BxDolStudioFormsQuery.php

@@ -48 +48 @@
                 `tf`.`uri_title` AS `uri_title`,
                 `tf`.`submit_name` AS `submit_name`,
-                `tf`.`deleteable` AS `deleteable`,
+                `tf`.`deletable` AS `deletable`,
                 `tf`.`active` AS `active`" . $sSelectClause . "
             FROM `sys_objects_form` AS `tf` " . $sJoinClause . "

trunk/studio/classes/BxDolStudioNavigationQuery.php

@@ -42 +42 @@
                 `tm`.`module` AS `module`,
                 `tm`.`template_id` AS `template_id`,
-                `tm`.`deleteable` AS `deleteable`,
+                `tm`.`deletable` AS `deletable`,
                 `tm`.`active` AS `active`,
                 `tm`.`override_class_name` AS `override_class_name`,

trunk/studio/templates/base/scripts/BxBaseStudioNavigationMenus.php

@@ -190 +190 @@
             unset($oForm->aInputs['set_title']);
 
-            $iId = (int)$oForm->insert(array('object' => $sObject, 'module' => BX_DOL_STUDIO_GRID_MODULE_CUSTOM, 'deleteable' => 1, 'active' => 1));
+            $iId = (int)$oForm->insert(array('object' => $sObject, 'module' => BX_DOL_STUDIO_GRID_MODULE_CUSTOM, 'deletable' => 1, 'active' => 1));
             if($iId != 0) {
                 bx_import('BxDolStudioLanguagesUtils');
@@ -433 +433 @@
                 continue;
 
-            if((int)$aMenu['deleteable'] != 1)
+            if((int)$aMenu['deletable'] != 1)
                 continue;
 
@@ -506 +506 @@
 
     protected function _getActionDelete ($sType, $sKey, $a, $isSmall = false, $isDisabled = false, $aRow = array()) {
-        if ($sType == 'single' && (int)$aRow['deleteable'] != 1)
+        if ($sType == 'single' && (int)$aRow['deletable'] != 1)
             return '';