Bläddra i källkod

Ticket #715 - Integration with Organizations module.

AntonLV 9 år sedan
förälder
incheckning
e71ec36486

+ 2 - 0
modules/boonex/organizations/classes/BxOrgsModule.php

@@ -17,6 +17,8 @@ class BxOrgsModule extends BxBaseModProfileModule
     function __construct(&$aModule)
     {
         parent::__construct($aModule);
+
+        $this->_aSearchableNamesExcept[] = $this->_oConfig->CNF['FIELD_AUTHOR'];
     }
 
     public function servicePrepareFields ($aFieldsProfile)

+ 10 - 3
modules/boonex/organizations/install/langs/en.xml

@@ -13,7 +13,7 @@
 	<string name="_bx_orgs_option_num_connections_quick"><![CDATA[Number of items in friends block]]></string>
 	<string name="_bx_orgs_option_per_page_browse"><![CDATA[Number of items per page]]></string>
     <string name="_bx_orgs_option_num_rss"><![CDATA[Number of items in RSS feed]]></string>
-    <string name="_bx_orgs_option_searchable_fields"><![CDATA[Searchable fields]]></string>
+    <string name="_bx_orgs_option_searchable_fields"><![CDATA[Searchable fields for keyword search]]></string>
     <string name="_bx_orgs_option_public_subscriptions"><![CDATA[Public following list]]></string>
     <string name="_bx_orgs_option_public_subscribed_me"><![CDATA[Public followers list]]></string>
 
@@ -87,6 +87,8 @@
 	<string name="_bx_orgs_page_title_active"><![CDATA[Active Organizations]]></string>
 	<string name="_bx_orgs_page_title_sys_online"><![CDATA[Online Organizations]]></string>
 	<string name="_bx_orgs_page_title_online"><![CDATA[Online Organizations]]></string>
+	<string name="_bx_orgs_page_title_sys_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_orgs_page_title_entries_search"><![CDATA[Search]]></string>
 
     <string name="_bx_orgs_page_block_title_profile_private"><![CDATA[Private Profile]]></string>
     <string name="_bx_orgs_page_block_title_choose_type"><![CDATA[Choose Profile Type]]></string>
@@ -119,8 +121,9 @@
 	<string name="_bx_orgs_page_block_title_manage"><![CDATA[Manage Organizations]]></string>
     <string name="_bx_orgs_page_block_title_active_profiles"><![CDATA[Active Organizations]]></string>
     <string name="_bx_orgs_page_block_title_online_profiles"><![CDATA[Online Organizations]]></string>
-
     <string name="_bx_orgs_page_block_title_categories"><![CDATA[Organization categories]]></string>
+    <string name="_bx_orgs_page_block_title_search_form"><![CDATA[Search Form]]></string>
+    <string name="_bx_orgs_page_block_title_search_results"><![CDATA[Search Results]]></string>
 
     <string name="_bx_orgs_menu_title_submenu"><![CDATA[Organizations Submenu]]></string>
     <string name="_bx_orgs_menu_set_title_submenu"><![CDATA[Organizations Submenu]]></string>
@@ -185,6 +188,8 @@
     <string name="_bx_orgs_menu_item_title_subscribed_me"><![CDATA[{addon} followers]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_recent"><![CDATA[New]]></string>
     <string name="_bx_orgs_menu_item_title_entries_recent"><![CDATA[New]]></string>
+    <string name="_bx_orgs_menu_item_title_system_entries_search"><![CDATA[Search]]></string>
+    <string name="_bx_orgs_menu_item_title_entries_search"><![CDATA[Search]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_orgs_menu_item_title_entries_manage"><![CDATA[Manage]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_home"><![CDATA[Orgs]]></string>
@@ -215,7 +220,9 @@
 
     <string name="_bx_orgs_chart_growth"><![CDATA[Organizations: Growth]]></string>
     <string name="_bx_orgs_chart_growth_speed"><![CDATA[Organizations: Growth Speed]]></string>
-    
+
+    <string name="_bx_orgs_search_extended"><![CDATA[Organizations Search]]></string>
+
     <string name="_bx_orgs_txt_account_pending"><![CDATA[This profile is pending approval, please wait until it is activated.]]></string>
     <string name="_bx_orgs_txt_account_suspended"><![CDATA[This profile is suspended.]]></string>
 

+ 4 - 1
modules/boonex/organizations/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_organizations';
-DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_organizations' OR `object` IN('bx_organizations_create_profile', 'bx_organizations_delete_profile', 'bx_organizations_edit_profile', 'bx_organizations_edit_profile_cover', 'bx_organizations_view_profile', 'bx_organizations_view_profile_closed', 'bx_organizations_profile_info', 'bx_organizations_profile_friends', 'bx_organizations_profile_favorites', 'bx_organizations_profile_subscriptions', 'bx_organizations_home');
+DELETE FROM `sys_pages_blocks` WHERE `module` = 'bx_organizations' OR `object` IN('bx_organizations_create_profile', 'bx_organizations_delete_profile', 'bx_organizations_edit_profile', 'bx_organizations_edit_profile_cover', 'bx_organizations_view_profile', 'bx_organizations_view_profile_closed', 'bx_organizations_profile_info', 'bx_organizations_profile_friends', 'bx_organizations_profile_favorites', 'bx_organizations_profile_subscriptions', 'bx_organizations_home', 'bx_organizations_search', 'bx_organizations_manage');
 
 -- MENU
 
@@ -43,6 +43,9 @@ DELETE FROM `sys_objects_category` WHERE `object` = 'bx_organizations_cats';
 -- SEARCH
 DELETE FROM `sys_objects_search` WHERE `ObjectName` = 'bx_organizations';
 
+-- SEARCH EXTENDED
+DELETE FROM `sys_objects_search_extended` WHERE `module` = 'bx_organizations';
+
 -- CONTENT INFO
 DELETE FROM `sys_objects_content_info` WHERE `name` = 'bx_organizations';
 

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

@@ -133,6 +133,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_organizations_online', 1, 'bx_organizations', '_bx_orgs_page_block_title_online_profiles', 11, 2147483647, 'service', 'a:3:{s:6:\"module\";s:16:\"bx_organizations\";s:6:\"method\";s:22:\"browse_online_profiles\";s:6:"params";a:1:{i:0;b:1;}}', 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_organizations_search', '_bx_orgs_page_title_sys_entries_search', '_bx_orgs_page_title_entries_search', 'bx_organizations', 5, 2147483647, 1, 'organizations-search', 'page.php?i=organizations-search', '', '', '', 0, 1, 0, 'BxOrgsPageBrowse', 'modules/boonex/organizations/classes/BxOrgsPageBrowse.php');
+
+INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES 
+('bx_organizations_search', 1, 'bx_organizations', '_bx_orgs_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:16:"bx_organizations";}}s:5:"class";s:27:"TemplSearchExtendedServices";}', 0, 1, 1, 1),
+('bx_organizations_search', 1, 'bx_organizations', '_bx_orgs_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:16:"bx_organizations";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_organizations_manage', '_bx_orgs_page_title_sys_manage', '_bx_orgs_page_title_manage', 'bx_organizations', 5, 2147483647, 1, 'organizations-manage', 'page.php?i=organizations-manage', '', '', '', 0, 1, 0, 'BxOrgsPageBrowse', 'modules/boonex/organizations/classes/BxOrgsPageBrowse.php');
@@ -222,7 +230,8 @@ INSERT INTO `sys_menu_items`(`set_name`, `module`, `name`, `title_system`, `titl
 ('bx_organizations_submenu', 'bx_organizations', 'organizations-home', '_bx_orgs_menu_item_title_system_entries_recent', '_bx_orgs_menu_item_title_entries_recent', 'page.php?i=organizations-home', '', '', '', '', 2147483647, 1, 1, 1),
 ('bx_organizations_submenu', 'bx_organizations', 'organizations-active', '_bx_orgs_menu_item_title_system_entries_active', '_bx_orgs_menu_item_title_entries_active', 'page.php?i=organizations-active', '', '', '', '', 2147483647, 1, 1, 2),
 ('bx_organizations_submenu', 'bx_organizations', 'organizations-online', '_bx_orgs_menu_item_title_system_entries_online', '_bx_orgs_menu_item_title_entries_online', 'page.php?i=organizations-online', '', '', '', '', 2147483647, 1, 1, 3),
-('bx_organizations_submenu', 'bx_organizations', 'organizations-manage', '_bx_orgs_menu_item_title_system_entries_manage', '_bx_orgs_menu_item_title_entries_manage', 'page.php?i=organizations-manage', '', '', '', '', 2147483646, 1, 1, 4);
+('bx_organizations_submenu', 'bx_organizations', 'organizations-search', '_bx_orgs_menu_item_title_system_entries_search', '_bx_orgs_menu_item_title_entries_search', 'page.php?i=organizations-search', '', '', '', '', 2147483647, 1, 1, 4),
+('bx_organizations_submenu', 'bx_organizations', 'organizations-manage', '_bx_orgs_menu_item_title_system_entries_manage', '_bx_orgs_menu_item_title_entries_manage', 'page.php?i=organizations-manage', '', '', '', '', 2147483646, 1, 1, 5);
 
 -- MENU: view submenu
 
@@ -362,6 +371,10 @@ SET @iSearchOrder = (SELECT IFNULL(MAX(`Order`), 0) FROM `sys_objects_search`);
 INSERT INTO `sys_objects_search` (`ObjectName`, `Title`, `Order`, `ClassName`, `ClassPath`) VALUES
 ('bx_organizations', '_bx_orgs', @iSearchOrder + 1, 'BxOrgsSearchResult', 'modules/boonex/organizations/classes/BxOrgsSearchResult.php');
 
+-- SEARCH EXTENDED
+INSERT INTO `sys_objects_search_extended` (`object`, `object_content_info`, `module`, `title`, `active`, `class_name`, `class_file`) VALUES
+('bx_organizations', 'bx_organizations', 'bx_organizations', '_bx_orgs_search_extended', 1, '', '');
+
 -- CONTENT INFO
 INSERT INTO `sys_objects_content_info` (`name`, `title`, `alert_unit`, `alert_action_add`, `alert_action_update`, `alert_action_delete`, `class_name`, `class_file`) VALUES
 ('bx_organizations', '_bx_orgs', 'bx_organizations', 'added', 'edited', 'deleted', '', '');

+ 9 - 2
modules/boonex/russian/data/langs/bx_organizations/ru.xml

@@ -13,7 +13,7 @@
 	<string name="_bx_orgs_option_num_connections_quick"><![CDATA[Число элементов в блоке друзей]]></string>
 	<string name="_bx_orgs_option_per_page_browse"><![CDATA[Число элементов на странице]]></string>
     <string name="_bx_orgs_option_num_rss"><![CDATA[Число элементов в ленте RSS]]></string>
-    <string name="_bx_orgs_option_searchable_fields"><![CDATA[Поля для поиска]]></string>
+    <string name="_bx_orgs_option_searchable_fields"><![CDATA[Поля для поиска по ключевому слову]]></string>
     <string name="_bx_orgs_option_public_subscriptions"><![CDATA[Открытый список подписок]]></string>
     <string name="_bx_orgs_option_public_subscribed_me"><![CDATA[Открытый список подписчиков]]></string>
 
@@ -87,6 +87,8 @@
 	<string name="_bx_orgs_page_title_active"><![CDATA[Последние Активные Организации]]></string>
 	<string name="_bx_orgs_page_title_sys_online"><![CDATA[Онлайн Организации]]></string>
 	<string name="_bx_orgs_page_title_online"><![CDATA[Онлайн Организации]]></string>
+	<string name="_bx_posts_page_title_sys_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_posts_page_title_entries_search"><![CDATA[Поиск]]></string>
 
     <string name="_bx_orgs_page_block_title_profile_private"><![CDATA[Приватный профиль]]></string>
     <string name="_bx_orgs_page_block_title_choose_type"><![CDATA[Выбрать тип профиля]]></string>
@@ -119,8 +121,9 @@
 	<string name="_bx_orgs_page_block_title_manage"><![CDATA[Управление организациями]]></string>
     <string name="_bx_orgs_page_block_title_active_profiles"><![CDATA[Последние Активные Организации]]></string>
     <string name="_bx_orgs_page_block_title_online_profiles"><![CDATA[Онлайн Организации]]></string>
-
 	<string name="_bx_orgs_page_block_title_categories"><![CDATA[Категории организаций]]></string>
+	<string name="_bx_posts_page_block_title_search_form"><![CDATA[Форма поиска]]></string>
+    <string name="_bx_posts_page_block_title_search_results"><![CDATA[Результаты поиска]]></string>
 
     <string name="_bx_orgs_menu_title_submenu"><![CDATA[Организации - Подменю]]></string>
     <string name="_bx_orgs_menu_set_title_submenu"><![CDATA[Организации - Подменю]]></string>
@@ -185,6 +188,8 @@
     <string name="_bx_orgs_menu_item_title_subscribed_me"><![CDATA[{addon} подписчика]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_recent"><![CDATA[Новые Организации]]></string>
     <string name="_bx_orgs_menu_item_title_entries_recent"><![CDATA[Новые Организации]]></string>
+    <string name="_bx_posts_menu_item_title_system_entries_search"><![CDATA[Поиск]]></string>
+    <string name="_bx_posts_menu_item_title_entries_search"><![CDATA[Поиск]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_manage"><![CDATA[Управление Организациями]]></string>
     <string name="_bx_orgs_menu_item_title_entries_manage"><![CDATA[Управление Организациями]]></string>
     <string name="_bx_orgs_menu_item_title_system_entries_home"><![CDATA[Организации]]></string>
@@ -216,6 +221,8 @@
     <string name="_bx_orgs_chart_growth"><![CDATA[Организации: Развитие]]></string>
     <string name="_bx_orgs_chart_growth_speed"><![CDATA[Организации: Скорость развития]]></string>
 
+    <string name="_bx_posts_search_extended"><![CDATA[Поиск организаций]]></string>
+
     <string name="_bx_orgs_txt_account_pending"><![CDATA[Этот профиль ожидает одобрения. Пожалуйста, дождитесь его активации.]]></string>
     <string name="_bx_orgs_txt_account_suspended"><![CDATA[Этот профиль заблокирован.]]></string>