Преглед изворни кода

Ticket #964 - Changes in Events module.

AntonLV пре 9 година
родитељ
комит
540f687aa7

+ 6 - 0
modules/boonex/events/classes/BxEventsSearchResult.php

@@ -76,6 +76,12 @@ class BxEventsSearchResult extends BxBaseModGroupsSearchResult
         $CNF = &$this->oModule->_oConfig->CNF;
 
         switch ($sMode) {
+            case 'created_entries':
+                if(!$this->_setAuthorConditions($sMode, $aParams, $oJoinedProfile)) {
+                    $this->isError = true;
+                    break;
+                }
+                break;
 
             case 'joined_entries':
                 $oJoinedProfile = BxDolProfile::getInstance((int)$aParams['joined_profile']);

+ 4 - 2
modules/boonex/events/install/langs/en.xml

@@ -73,8 +73,8 @@
 	<string name="_bx_events_acl_action_view_profile"><![CDATA[View Event]]></string>
 	<string name="_bx_events_acl_action_edit_any_profile"><![CDATA[Edit Any Event]]></string>
 
-	<string name="_bx_events_page_title_sys_joined_entries"><![CDATA[Joined Events]]></string>
-	<string name="_bx_events_page_title_joined_entries"><![CDATA[Joined Events]]></string>
+	<string name="_bx_events_page_title_sys_joined_entries"><![CDATA[Profile Events]]></string>
+	<string name="_bx_events_page_title_joined_entries"><![CDATA[Profile Events]]></string>
 	<string name="_bx_events_page_title_sys_create_profile"><![CDATA[Create Event]]></string>
 	<string name="_bx_events_page_title_create_profile"><![CDATA[Create Event]]></string>
 	<string name="_bx_events_page_title_sys_edit_profile"><![CDATA[Edit Event]]></string>
@@ -115,6 +115,8 @@
 	<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_sys_entries_of_author"><![CDATA[Events of author]]></string>
+    <string name="_bx_events_page_block_title_entries_of_author"><![CDATA[Events by {display_name}]]></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>
 	<string name="_bx_events_page_block_title_sys_joined_entries"><![CDATA[Joined Events]]></string>

+ 3 - 2
modules/boonex/events/install/sql/enable.sql

@@ -165,8 +165,9 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_events_joined', 'joined-events', '_bx_events_page_title_sys_joined_entries', '_bx_events_page_title_joined_entries', 'bx_events', 5, 2147483647, 1, '', '', '', '', 0, 1, 0, 'BxEventsPageJoinedEntries', 'modules/boonex/events/classes/BxEventsPageJoinedEntries.php');
 
 INSERT INTO `sys_pages_blocks`(`object`, `cell_id`, `module`, `title_system`, `title`, `designbox_id`, `visible_for_levels`, `type`, `content`, `deletable`, `copyable`, `active`, `order`) VALUES
-('bx_events_joined', 1, 'bx_events', '_bx_events_page_block_title_sys_favorites_of_author', '_bx_events_page_block_title_favorites_of_author', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_events";s:6:"method";s:15:"browse_favorite";s:6:"params";a:1:{i:0;s:12:"{profile_id}";}}', 0, 1, 1, 1),
-('bx_events_joined', 1, 'bx_events', '_bx_events_page_block_title_sys_joined_entries', '_bx_events_page_block_title_joined_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_events";s:6:"method";s:21:"browse_joined_entries";s:6:"params";a:2:{i:0;i:0;i:1;b:1;}}', 0, 0, 1, 2);
+('bx_events_joined', 1, 'bx_events', '_bx_events_page_block_title_sys_entries_of_author', '_bx_events_page_block_title_entries_of_author', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_events";s:6:"method";s:22:"browse_created_entries";}', 0, 0, 0, 1),
+('bx_events_joined', 1, 'bx_events', '_bx_events_page_block_title_sys_favorites_of_author', '_bx_events_page_block_title_favorites_of_author', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_events";s:6:"method";s:15:"browse_favorite";s:6:"params";a:1:{i:0;s:12:"{profile_id}";}}', 0, 1, 1, 2),
+('bx_events_joined', 1, 'bx_events', '_bx_events_page_block_title_sys_joined_entries', '_bx_events_page_block_title_joined_entries', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_events";s:6:"method";s:21:"browse_joined_entries";s:6:"params";a:2:{i:0;i:0;i:1;b:1;}}', 0, 0, 1, 3);
 
 -- PAGE: add block to homepage
 SET @iBlockOrder = (SELECT `order` FROM `sys_pages_blocks` WHERE `object` = 'sys_home' AND `cell_id` = 1 ORDER BY `order` DESC LIMIT 1);

+ 4 - 2
modules/boonex/russian/data/langs/bx_events/ru.xml

@@ -73,8 +73,8 @@
 	<string name="_bx_events_acl_action_view_profile"><![CDATA[Просмотреть событие]]></string>
 	<string name="_bx_events_acl_action_edit_any_profile"><![CDATA[Редактировать любое событие]]></string>
 
-	<string name="_bx_events_page_title_sys_joined_entries"><![CDATA[Участие в событиях]]></string>
-	<string name="_bx_events_page_title_joined_entries"><![CDATA[Участие в событиях]]></string>
+	<string name="_bx_events_page_title_sys_joined_entries"><![CDATA[События профиля]]></string>
+	<string name="_bx_events_page_title_joined_entries"><![CDATA[События профиля]]></string>
 	<string name="_bx_events_page_title_sys_create_profile"><![CDATA[Создать событие]]></string>
 	<string name="_bx_events_page_title_create_profile"><![CDATA[Создать событие]]></string>
 	<string name="_bx_events_page_title_sys_edit_profile"><![CDATA[Редактировать событие]]></string>
@@ -115,6 +115,8 @@
     <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_sys_entries_of_author"><![CDATA[События автора]]></string>
+    <string name="_bx_events_page_block_title_entries_of_author"><![CDATA[{display_name} - События]]></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>
 	<string name="_bx_events_page_block_title_sys_joined_entries"><![CDATA[Участие в событиях]]></string>