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

Ticket #715 - Integration with Events module.

AntonLV 9 лет назад
Родитель
Сommit
4014fd270e

+ 0 - 1
inc/classes/BxDolSearchExtended.php

@@ -11,7 +11,6 @@ class BxDolSearchExtended extends BxDolFactory implements iBxDolFactoryObject
 {
     public static $SEARCHABLE_TYPES = array(
         'text', 'textarea', 'number', 
-    	'datepicker', 'date_time', 'datetime', 
     	'select', 'radio_set', 
     	'checkbox', 'switcher'
     );

+ 1 - 0
modules/boonex/events/classes/BxEventsConfig.php

@@ -148,6 +148,7 @@ class BxEventsConfig extends BxBaseModProfileConfig
                 'txt_N_fans' => '_bx_events_txt_N_fans',
                 'txt_ntfs_join_request' => '_bx_events_txt_ntfs_join_request',
                 'txt_ntfs_fan_added' => '_bx_events_txt_ntfs_fan_added',
+            	'form_field_author' => '_bx_events_form_entry_input_author',
                 'menu_item_title_befriend_sent' => '_bx_events_menu_item_title_befriend_sent',
                 'menu_item_title_unfriend_cancel_request' => '_bx_events_menu_item_title_unfriend_cancel_request',
                 'menu_item_title_befriend_confirm' => '_bx_events_menu_item_title_befriend_confirm',

+ 10 - 1
modules/boonex/events/install/langs/en.xml

@@ -17,6 +17,7 @@
 	<string name="_bx_events_form_profile_display_view"><![CDATA[View Event]]></string>
     <string name="_bx_events_form_profile_display_view_full"><![CDATA[Full View Event]]></string>
     <string name="_bx_events_form_profile_display_invite"><![CDATA[Invite to Event]]></string>
+    <string name="_bx_events_form_entry_input_author"><![CDATA[Author]]></string>
 	<string name="_bx_events_form_profile_input_sys_do_submit"><![CDATA[Submit]]></string>
     <string name="_bx_events_form_profile_input_sys_join_confirm"><![CDATA[Join confirmation]]></string>
     <string name="_bx_events_form_profile_input_join_confirm"><![CDATA[Join confirmation]]></string>
@@ -107,6 +108,8 @@
     <string name="_bx_events_page_title_calendar"><![CDATA[Events Calendar]]></string>
     <string name="_bx_events_page_title_sys_invite_to_group"><![CDATA[Invite Members to the Event]]></string>
 	<string name="_bx_events_page_title_invite_to_group"><![CDATA[Invite Members to the Event]]></string>
+	<string name="_bx_events_page_title_sys_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_events_page_title_entries_search"><![CDATA[Search]]></string>
 
 	<string name="_bx_events_page_block_title_favorites_of_author"><![CDATA[Favorite Events]]></string>
     <string name="_bx_events_page_block_title_sys_favorites_of_author"><![CDATA[Favorite Events]]></string>
@@ -140,7 +143,9 @@
     <string name="_bx_events_page_block_title_profile_calendar"><![CDATA[Calendar]]></string>
     <string name="_bx_events_page_block_title_entry_location"><![CDATA[Location]]></string>
     <string name="_bx_events_page_block_title_invite_to_group"><![CDATA[Invite Members to the Event]]></string>
-
+    <string name="_bx_events_page_block_title_search_form"><![CDATA[Search Form]]></string>
+    <string name="_bx_events_page_block_title_search_results"><![CDATA[Search Results]]></string>
+    
     <string name="_bx_events_menu_title_submenu"><![CDATA[Events Submenu]]></string>
     <string name="_bx_events_menu_set_title_submenu"><![CDATA[Events Submenu]]></string>
     <string name="_bx_events_menu_set_title_view_profile_actions"><![CDATA[Event Actions]]></string>
@@ -213,6 +218,8 @@
     <string name="_bx_events_menu_item_title_manage_my_groups"><![CDATA[{addon} events]]></string>
     <string name="_bx_events_menu_item_title_system_entries_recent"><![CDATA[New]]></string>
     <string name="_bx_events_menu_item_title_entries_recent"><![CDATA[New]]></string>
+    <string name="_bx_events_menu_item_title_system_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_events_menu_item_title_entries_search"><![CDATA[Search]]></string>
     <string name="_bx_events_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_events_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_events_menu_item_title_system_entries_home"><![CDATA[Events]]></string>
@@ -243,6 +250,8 @@
     <string name="_bx_events_chart_growth"><![CDATA[Events: Growth]]></string>
     <string name="_bx_events_chart_growth_speed"><![CDATA[Events: Growth Speed]]></string>
 
+    <string name="_bx_events_search_extended"><![CDATA[Events Search]]></string>
+
     <string name="_bx_events_txt_account_pending"><![CDATA[This event is pending approval, please wait until it is activated.]]></string>
     <string name="_bx_events_txt_account_suspended"><![CDATA[This event is suspended.]]></string>
     <string name="_bx_events_txt_N_fans"><![CDATA[{0} members]]></string>

+ 4 - 1
modules/boonex/events/install/sql/disable.sql

@@ -10,7 +10,7 @@ DELETE FROM `sys_options_types` WHERE `id` = @iTypeId;
 -- PAGES
 
 DELETE FROM `sys_objects_page` WHERE `module` = 'bx_events';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_events' OR `object` IN('bx_events_create_profile', 'bx_events_delete_profile', 'bx_events_edit_profile', 'bx_events_edit_profile_cover', 'bx_events_invite', 'bx_events_view_profile', 'bx_events_view_profile_closed', 'bx_events_profile_info', 'bx_events_home', 'bx_events_fans', 'bx_events_joined', 'bx_events_top', 'bx_events_manage', 'bx_events_administration');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_events' OR `object` IN('bx_events_create_profile', 'bx_events_delete_profile', 'bx_events_edit_profile', 'bx_events_edit_profile_cover', 'bx_events_invite', 'bx_events_view_profile', 'bx_events_view_profile_closed', 'bx_events_profile_info', 'bx_events_home', 'bx_events_fans', 'bx_events_joined', 'bx_events_top', 'bx_events_search', 'bx_events_manage', 'bx_events_administration');
 
 -- MENU
 
@@ -46,6 +46,9 @@ DELETE FROM `sys_objects_category` WHERE `object` = 'bx_events_cats';
 -- SEARCH
 DELETE FROM `sys_objects_search` WHERE `ObjectName` = 'bx_events';
 
+-- SEARCH EXTENDED
+DELETE FROM `sys_objects_search_extended` WHERE `module` = 'bx_events';
+
 -- CONNECTIONS
 DELETE FROM `sys_objects_connection` WHERE `object` = 'bx_events_fans';
 

+ 14 - 1
modules/boonex/events/install/sql/enable.sql

@@ -126,6 +126,14 @@ INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `lay
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `order`) VALUES 
 ('bx_events_calendar', 1, 'bx_events', '_bx_events_page_block_title_calendar', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:8:"calendar";}', 0, 1, 0);
 
+-- PAGE: search for entries
+INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
+('bx_events_search', '_bx_events_page_title_sys_entries_search', '_bx_events_page_title_entries_search', 'bx_events', 5, 2147483647, 1, 'events-search', 'page.php?i=events-search', '', '', '', 0, 1, 0, 'BxEventsPageBrowse', 'modules/boonex/events/classes/BxEventsPageBrowse.php');
+
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('bx_events_search', 1, 'bx_events', '_bx_events_page_block_title_search_form', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:8:"get_form";s:6:"params";a:1:{i:0;a:1:{s:6:"object";s:9:"bx_events";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 1),
+('bx_events_search', 1, 'bx_events', '_bx_events_page_block_title_search_results', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:11:"get_results";s:6:"params";a:1:{i:0;a:2:{s:6:"object";s:9:"bx_events";s:10:"show_empty";b:1;}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 2);
+
 -- PAGE: module manage own
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES 
 ('bx_events_manage', '_bx_events_page_title_sys_manage', '_bx_events_page_title_manage', 'bx_events', 5, 2147483647, 1, 'events-manage', 'page.php?i=events-manage', '', '', '', 0, 1, 0, 'BxEventsPageBrowse', 'modules/boonex/events/classes/BxEventsPageBrowse.php');
@@ -220,7 +228,8 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_events_submenu', 'bx_events', 'events-home', '_bx_events_menu_item_title_system_entries_recent', '_bx_events_menu_item_title_entries_recent', 'page.php?i=events-home', '', '', '', '', 2147483647, 1, 1, 1),
 ('bx_events_submenu', 'bx_events', 'events-top', '_bx_events_menu_item_title_system_entries_top', '_bx_events_menu_item_title_entries_top', 'page.php?i=events-top', '', '', '', '', 2147483647, 1, 1, 2),
 ('bx_events_submenu', 'bx_events', 'events-calendar', '_bx_events_menu_item_title_system_calendar', '_bx_events_menu_item_title_calendar', 'page.php?i=events-calendar', '', '', '', '', 2147483647, 1, 1, 3),
-('bx_events_submenu', 'bx_events', 'events-manage', '_bx_events_menu_item_title_system_entries_manage', '_bx_events_menu_item_title_entries_manage', 'page.php?i=events-manage', '', '', '', '', 2147483646, 1, 1, 4);
+('bx_events_submenu', 'bx_events', 'events-search', '_bx_events_menu_item_title_system_entries_search', '_bx_events_menu_item_title_entries_search', 'page.php?i=events-search', '', '', '', '', 2147483647, 1, 1, 4),
+('bx_events_submenu', 'bx_events', 'events-manage', '_bx_events_menu_item_title_system_entries_manage', '_bx_events_menu_item_title_entries_manage', 'page.php?i=events-manage', '', '', '', '', 2147483646, 1, 1, 5);
 
 -- MENU: view submenu
 
@@ -357,6 +366,10 @@ SET @iSearchOrder = (SELECT IFNULL(MAX(`Order`), 0) FROM `sys_objects_search`);
 INSERT INTO `sys_objects_search` (`ObjectName`, `Title`, `Order`, `ClassName`, `ClassPath`) VALUES
 ('bx_events', '_bx_events', @iSearchOrder + 1, 'BxEventsSearchResult', 'modules/boonex/events/classes/BxEventsSearchResult.php');
 
+-- SEARCH EXTENDED
+INSERT INTO `sys_objects_search_extended` (`object`, `object_content_info`, `module`, `title`, `active`, `class_name`, `class_file`) VALUES
+('bx_events', 'bx_events', 'bx_events', '_bx_events_search_extended', 1, '', '');
+
 -- CONNECTIONS
 INSERT INTO `sys_objects_connection` (`object`, `table`, `type`, `override_class_name`, `override_class_file`) VALUES
 ('bx_events_fans', 'bx_events_fans', 'mutual', '', '');

+ 9 - 0
modules/boonex/russian/data/langs/bx_events/ru.xml

@@ -17,6 +17,7 @@
 	<string name="_bx_events_form_profile_display_view"><![CDATA[Просмотр события]]></string>
     <string name="_bx_events_form_profile_display_view_full"><![CDATA[Полный просмотр события]]></string>
     <string name="_bx_events_form_profile_display_invite"><![CDATA[Приглашение на событие]]></string>
+    <string name="_bx_events_form_entry_input_author"><![CDATA[Автор]]></string>
 	<string name="_bx_events_form_profile_input_sys_do_submit"><![CDATA[Выполнить]]></string>
     <string name="_bx_events_form_profile_input_sys_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
     <string name="_bx_events_form_profile_input_join_confirm"><![CDATA[Подтверждение регистрации]]></string>
@@ -105,6 +106,8 @@
     <string name="_bx_events_page_title_calendar"><![CDATA[Календарь событий]]></string>
     <string name="_bx_events_page_title_sys_invite_to_group"><![CDATA[Приглашение на событие]]></string>
     <string name="_bx_events_page_title_invite_to_group"><![CDATA[Приглашение на событие]]></string>
+    <string name="_bx_events_page_title_sys_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_events_page_title_entries_search"><![CDATA[Поиск]]></string>
 
 	<string name="_bx_events_page_block_title_favorites_of_author"><![CDATA[Избранные события]]></string>   
     <string name="_bx_events_page_block_title_sys_favorites_of_author"><![CDATA[Избранные события]]></string>
@@ -139,6 +142,8 @@
     <string name="_bx_events_page_block_title_entry_location"><![CDATA[Местоположение]]></string>
     <string name="_bx_events_page_block_title_categories"><![CDATA[Категории групп]]></string>
     <string name="_bx_events_page_block_title_invite_to_group"><![CDATA[Приглашение на событие]]></string>
+    <string name="_bx_events_page_block_title_search_form"><![CDATA[Форма поиска]]></string>
+    <string name="_bx_events_page_block_title_search_results"><![CDATA[Результаты поиска]]></string>
 
     <string name="_bx_events_menu_title_submenu"><![CDATA[Под-меню событий]]></string>
     <string name="_bx_events_menu_set_title_submenu"><![CDATA[Под-меню событий]]></string>
@@ -212,6 +217,8 @@
     <string name="_bx_events_menu_item_title_manage_my_groups"><![CDATA[{addon} событий]]></string>
     <string name="_bx_events_menu_item_title_system_entries_recent"><![CDATA[Новые]]></string>
     <string name="_bx_events_menu_item_title_entries_recent"><![CDATA[Новые]]></string>
+    <string name="_bx_events_menu_item_title_system_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_events_menu_item_title_entries_search"><![CDATA[Поиск]]></string>
     <string name="_bx_events_menu_item_title_system_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_events_menu_item_title_entries_manage"><![CDATA[Управление]]></string>
     <string name="_bx_events_menu_item_title_system_entries_home"><![CDATA[События]]></string>
@@ -242,6 +249,8 @@
     <string name="_bx_events_chart_growth"><![CDATA[События: Развитие]]></string>
     <string name="_bx_events_chart_growth_speed"><![CDATA[События: Скорость развития]]></string>
 
+    <string name="_bx_events_search_extended"><![CDATA[Поиск событий]]></string>
+
     <string name="_bx_events_txt_account_pending"><![CDATA[Это событие ожидает одобрения. Пожалуйста, дождитесь ее активации.]]></string>
     <string name="_bx_events_txt_account_suspended"><![CDATA[Это событие заблокировано.]]></string>
     <string name="_bx_events_txt_N_fans"><![CDATA[{0} участников]]></string>