Index: branches/1.3.x/units/widgets/widgets_config.php =================================================================== --- branches/1.3.x/units/widgets/widgets_config.php (revision 16102) +++ branches/1.3.x/units/widgets/widgets_config.php (revision 16103) @@ -1,213 +1,219 @@ 'widget', 'ItemClass' => Array ('class' => 'kDBItem', 'file' => '', 'build_event' => 'OnItemBuild'), 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), 'EventHandlerClass' => Array ('class' => 'WidgetEventHandler', 'file' => 'widget_eh.php', 'build_event' => 'OnBuild'), 'TagProcessorClass' => Array ('class' => 'WidgetTagProcessor', 'file' => 'widget_tp.php', 'build_event' => 'OnBuild'), 'AutoLoad' => true, 'QueryString' => Array ( 1 => 'id', 2 => 'Page', 3 => 'PerPage', 4 => 'event', 5 => 'mode', ), // in case, when one method does everything 'RewriteListener' => 'WidgetRewriteListener', // in case, when building and parsing is done by separate methods // 'RewriteListener' => Array ('WidgetRewriteBuilder', 'WidgetRewriteParser'), 'IDField' => 'WidgetId', 'StatusField' => Array ('Status'), 'TableName' => TABLE_PREFIX.'Widgets', /* 'ForeignKey' => 'ParentId', // field title in TableName, linking record to a parent 'ParentTableKey' => 'ParentId', // id (or other key) field title in parent's table 'ParentPrefix' => 'parent', 'AutoDelete' => true, // delete these items when parent is being deleted 'AutoClone' => true, // clone these items when parent is being cloned */ // used to build editing links in admin grids 'AdminTemplatePath' => 'widgets', 'AdminTemplatePrefix' => 'widget_', 'TitlePresets' => Array ( 'default' => Array ( 'new_status_labels' => Array ('widget' => '!la_title_AddingWidget!'), 'edit_status_labels' => Array ('widget' => '!la_title_EditingWidget!'), 'new_titlefield' => Array ('widget' => '!la_title_NewWidget!'), ), 'widget_list' => Array ( 'prefixes' => Array ('widget_List'), 'format' => '#section_label#', 'toolbar_buttons' => Array ('new_item', 'edit', 'delete', 'approve', 'decline', 'export', 'import', 'view', 'dbl-click',), ), 'widget_edit' => Array ( 'prefixes' => Array ('widget'), 'format' => '#widget_status# - #widget_titlefield#', 'toolbar_buttons' => Array ('select', 'cancel', 'reset_edit', 'prev', 'next'), ), ), 'PermSection' => Array ('main' => 'custom:widgets'), 'Sections' => Array ( 'custom:widgets' => Array ( 'parent' => 'custom', 'icon' => 'custom', 'label' => 'la_tab_Widgets', 'url' => Array ('t' => 'custom/widgets/widget_list', 'pass' => 'm'), 'permissions' => Array ('view', 'add', 'edit', 'delete'), 'priority' => 1, 'type' => stTREE, ), ), 'TitleField' => 'Title', // field, used in bluebar when editing existing item // Use %1$s for local table name with prefix, %2$s for calculated fields 'ListSQLs' => Array ( // key - special, value - list select sql '' => ' SELECT %1$s.* %2$s FROM %1$s', ), 'ListSortings' => Array ( '' => Array ( // 'ForcedSorting' => Array ('Priority' => 'desc'), 'Sorting' => Array ('Title' => 'asc'), ) ), + 'CalculatedFields' => array( + '' => array( + 'VirtualActionField' => '%1$s.WidgetId', + ) + ), + 'VirtualFields' => Array ( 'VirtualActionField' => Array ('type' => 'string', 'default' => ''), ), 'Fields' => Array ( 'WidgetId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), 'Title' => Array ( 'type' => 'string', 'max_len' => 255, 'required' => 1, 'default' => '', 'not_null' => 1, ), 'Description' => Array ( 'type' => 'string', 'formatter' => 'kFormatter', 'using_fck' => 1, 'default' => null, ), 'Email' => Array ( 'type' => 'string', 'formatter' => 'kFormatter', 'regexp' => '/^(' . REGEX_EMAIL_USER . '@' . REGEX_EMAIL_DOMAIN . ')$/i', 'sample_value' => 'email@domain.com', 'not_null' => 1, 'default' => '', 'error_msgs' => Array ('invalid_format' => '!la_invalid_email!'), ), 'Type' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'use_phrases' => 1, 'options' => Array ( 1 => 'la_opt_Default', 2 => 'la_opt_Custom', ), 'not_null' => 1, 'default' => 1, 'required' => 1, ), 'Phone' => Array ( 'type' => 'string', 'formatter' => 'kFormatter', 'default' => '', 'using_fck' => 1, 'not_null' => 1), 'Qty' => Array ( 'type' => 'double', 'required' => 0, 'not_null' => 1, 'default' => 0 ), 'Status' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => array (1 => 'la_Active', 2 => 'la_Pending', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 2, ), 'CreatedOn' => Array ( 'type' => 'int', 'formatter' => 'kDateFormatter', 'time_format' => '', 'input_time_format' => '', 'default' => '#NOW#', ), 'Good' => Array ( 'type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 0 ), 'BirthTime' => Array ( 'type' => 'int', 'formatter' => 'kDateFormatter', 'date_format' => '', 'input_date_format' => '', 'default' => null ), 'Image' => Array ( 'type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, // in Bytes ! 'file_types' => '*.jpg;*.jpeg;*.gif;*.png;*.bmp', 'files_description' => '!la_hint_ImageFiles!', 'upload_dir' => '/system/user_files/', // relative to project's home 'as_image' => true, 'thumb_format' => 'resize:100x100', 'multiple' => false, // false or max number of files - will be stored as serialized array of paths 'direct_links' => false, // use direct file urls or send files through wrapper (requires mod_mime_magic) 'filename_prefix' => '', 'filename_suffix' => '', 'storage_engine' => StorageEngine::HASH, 'required' => 1, 'default' => null ), 'DataFile' => Array ( 'type' => 'string', 'formatter' => 'kUploadFormatter', 'max_size' => MAX_UPLOAD_SIZE, // in Bytes ! 'file_types' => '*.*', 'files_description' => '!la_hint_AllFiles!', 'upload_dir' => '/system/user_files/', // relative to project's home 'as_image' => false, 'multiple' => 5, // false or max number of files - will be stored as serialized array of paths 'direct_links' => true, // use direct file urls or send files through wrapper (requires mod_mime_magic) 'default' => null ), ), 'Grids' => Array ( 'Default' => Array ( // 'Icons' => Array ('default' => 'icon16_custom.gif'), 'Fields' => Array ( 'WidgetId' => Array ('title' => 'column:la_fld_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), 'Title' => Array ('title' => 'column:la_fld_Name', 'data_block' => 'grid_custom_td'), 'Image' => Array ('data_block' => 'grid_image_td', 'filter_block' => 'grid_empty_filter', 'width' => 120), 'Type' => Array ('filter_block' => 'grid_options_filter'), 'Status' => Array ('filter_block' => 'grid_options_filter'), 'Good' => Array ('filter_block' => 'grid_like_filter'), 'Qty' => Array ('header_block' => 'grid_column_title_no_sorting', 'filter_block' => 'grid_range_filter'), 'Email' => Array ('filter_block' => 'grid_like_filter'), 'Phone' => Array ('filter_block' => 'grid_like_filter'), 'CreatedOn' => Array ('filter_block' => 'grid_date_range_filter'), 'Description' => Array ('filter_block' => 'grid_like_filter'), 'VirtualActionField' => Array ('title' => 'column:la_fld_Action', 'data_block' => 'grid_delete_td'), ), ), ), /*'ConfigMapping' => Array ( 'PerPage' => 'Perpage_Widgets', 'ShortListPerPage' => 'Perpage_Widgets_Short', ),*/ ); \ No newline at end of file Index: branches/1.3.x/install/upgrades.php =================================================================== --- branches/1.3.x/install/upgrades.php (revision 16102) +++ branches/1.3.x/install/upgrades.php (revision 16103) @@ -1,64 +1,65 @@ dependencies = Array ( '1.0.0' => Array ('Core' => '5.0.0'), '1.0.1' => Array ('Core' => '5.0.1'), '1.0.2-B1' => Array ('Core' => '5.0.2-B1'), '1.0.2-B2' => Array ('Core' => '5.0.2-B2'), '1.0.2-RC1' => Array ('Core' => '5.0.2-RC1'), '1.0.2' => Array ('Core' => '5.0.2'), '1.0.3-B1' => Array ('Core' => '5.0.3-B1'), '1.0.3-RC1' => Array ('Core' => '5.0.3-RC1'), '1.0.3' => Array ('Core' => '5.0.3'), '1.0.4-B1' => Array ('Core' => '5.0.4-B1'), '1.0.4' => Array ('Core' => '5.0.4'), '1.1.0-B1' => Array ('Core' => '5.1.0-B1'), '1.1.0-B2' => Array ('Core' => '5.1.0-B2'), '1.1.0-RC1' => Array ('Core' => '5.1.0-RC1'), '1.1.0' => Array ('Core' => '5.1.0'), '1.1.1-B1' => Array ('Core' => '5.1.1-B1'), '1.1.1-RC1' => Array ('Core' => '5.1.1-RC1'), '1.1.1' => Array ('Core' => '5.1.1'), '1.1.2-B1' => Array ('Core' => '5.1.2-B1'), '1.1.2-RC1' => Array ('Core' => '5.1.2-RC1'), '1.1.2' => Array ('Core' => '5.1.2'), '1.1.3-B1' => Array ('Core' => '5.1.3-B1'), '1.1.3-B2' => Array ('Core' => '5.1.3-B2'), '1.1.3' => Array ('Core' => '5.1.3'), '1.2.0-B1' => Array ('Core' => '5.2.0-B1'), '1.2.0-B2' => Array ('Core' => '5.2.0-B2'), '1.2.0-B3' => Array ('Core' => '5.2.0-B3'), '1.2.0-RC1' => Array ('Core' => '5.2.0-RC1'), '1.2.0' => Array ('Core' => '5.2.0'), '1.2.1-B1' => Array ('Core' => '5.2.1-B1'), '1.2.1-B2' => Array ('Core' => '5.2.1-B2'), '1.2.1-RC1' => Array ('Core' => '5.2.1-RC1'), + '1.2.1' => Array ('Core' => '5.2.1'), ); } } Index: branches/1.3.x/install/upgrades.sql =================================================================== --- branches/1.3.x/install/upgrades.sql (revision 16102) +++ branches/1.3.x/install/upgrades.sql (revision 16103) @@ -1,70 +1,72 @@ # ===== v 1.0.0 ===== # ===== v 1.0.1 ===== UPDATE Modules SET LoadOrder = 10 WHERE `Name` = 'Custom'; # ===== v 1.0.2-B1 ===== ALTER TABLE Widgets CHANGE CreatedOn CreatedOn INT(11) NULL DEFAULT NULL; UPDATE Modules SET TemplatePath = 'custom/' WHERE Name = 'Custom'; # ===== v 1.0.2-B2 ===== # ===== v 1.0.2-RC1 ===== # ===== v 1.0.2 ===== # ===== v 1.0.3-B1 ===== # ===== v 1.0.3-RC1 ===== # ===== v 1.0.3 ===== # ===== v 1.0.4-B1 ===== # ===== v 1.0.4 ===== # ===== v 1.1.0-B1 ===== UPDATE Modules SET Path = 'modules/custom/' WHERE `Name` = 'Custom'; # ===== v 1.1.0-B2 ===== # ===== v 1.1.0-RC1 ===== # ===== v 1.1.0 ===== # ===== v 1.1.1-B1 ===== # ===== v 1.1.1-RC1 ===== # ===== v 1.1.1 ===== # ===== v 1.1.2-B1 ===== # ===== v 1.1.2-RC1 ===== # ===== v 1.1.2 ===== # ===== v 1.1.3-B1 ===== # ===== v 1.1.3-B2 ===== # ===== v 1.1.3 ===== # ===== v 1.2.0-B1 ===== # ===== v 1.2.0-B2 ===== # ===== v 1.2.0-B3 ===== # ===== v 1.2.0-RC1 ===== # ===== v 1.2.0 ===== # ===== v 1.2.1-B1 ===== # ===== v 1.2.1-B2 ===== UPDATE Modules SET ClassNamespace = 'Intechnic\\InPortal\\Modules\\Custom' WHERE `Name` = 'Custom'; # ===== v 1.2.1-RC1 ===== + +# ===== v 1.2.1 ===== Property changes on: branches/1.3.x ___________________________________________________________________ Modified: svn:mergeinfo Merged /modules/custom/releases/1.2.1:r16085 Merged /modules/custom/branches/1.2.x:r15896-16084