Przeglądaj źródła

Ticket #1783 - Usage in Organizations.

AntonLV 8 lat temu
rodzic
commit
bad411b3bd

+ 1 - 1
modules/base/groups/classes/BxBaseModGroupsModule.php

@@ -396,7 +396,7 @@ class BxBaseModGroupsModule extends BxBaseModProfileModule
 
         $aSettingsTypes = array('follow_context');
         if($this->serviceActAsProfile())
-            $aSettingsTypes[] = 'follow_member';
+            $aSettingsTypes = array('personal', 'follow_member');
 
         return array(
             'handlers' => array(

+ 3 - 0
modules/boonex/notifications/install/langs/en.xml

@@ -64,10 +64,13 @@
     <string name="_bx_ntfs_alert_action_doVote_personal"><![CDATA[Someone adds a like to your content]]></string>
     <string name="_bx_ntfs_alert_action_doVote_follow_member"><![CDATA[New likes]]></string>
     <string name="_bx_ntfs_alert_action_doVote_follow_context"><![CDATA[New likes]]></string>
+    <string name="_bx_ntfs_alert_action_fan_added_personal"><![CDATA[New fans]]></string>
     <string name="_bx_ntfs_alert_action_fan_added_follow_member"><![CDATA[New fans]]></string>
     <string name="_bx_ntfs_alert_action_fan_added_follow_context"><![CDATA[New fans]]></string>
+    <string name="_bx_ntfs_alert_action_join_request_personal"><![CDATA[New join requests]]></string>
     <string name="_bx_ntfs_alert_action_join_request_follow_member"><![CDATA[New join requests]]></string>
     <string name="_bx_ntfs_alert_action_join_request_follow_context"><![CDATA[New join requests]]></string>
+    <string name="_bx_ntfs_alert_action_timeline_post_common_personal"><![CDATA[New posts on Timeline]]></string>
     <string name="_bx_ntfs_alert_action_timeline_post_common_follow_member"><![CDATA[New posts on Timeline]]></string>
     <string name="_bx_ntfs_alert_action_timeline_post_common_follow_context"><![CDATA[New posts on Timeline]]></string>
 

+ 22 - 0
modules/boonex/organizations/classes/BxOrgsVote.php

@@ -0,0 +1,22 @@
+<?php defined('BX_DOL') or die('hack attempt');
+/**
+ * Copyright (c) UNA, Inc - https://una.io
+ * MIT License - https://opensource.org/licenses/MIT
+ *
+ * @defgroup    Organizations Organizations
+ * @ingroup     UnaModules
+ *
+ * @{
+ */
+
+class BxOrgsVote extends BxBaseModProfileVote
+{
+    function __construct($sSystem, $iId, $iInit = 1)
+    {
+    	$this->_sModule = 'bx_organizations';
+
+        parent::__construct($sSystem, $iId, $iInit);        
+    }
+}
+
+/** @} */

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

@@ -480,7 +480,7 @@ INSERT INTO `sys_objects_view` (`name`, `module`, `table_track`, `period`, `is_o
 
 -- VOTES
 INSERT INTO `sys_objects_vote` (`Name`, `TableMain`, `TableTrack`, `PostTimeout`, `MinValue`, `MaxValue`, `IsUndo`, `IsOn`, `TriggerTable`, `TriggerFieldId`, `TriggerFieldAuthor`, `TriggerFieldRate`, `TriggerFieldRateCount`, `ClassName`, `ClassFile`) VALUES 
-('bx_organizations', 'bx_organizations_votes', 'bx_organizations_votes_track', '604800', '1', '1', '0', '1', 'bx_organizations_data', 'id', 'author', 'rate', 'votes', '', '');
+('bx_organizations', 'bx_organizations_votes', 'bx_organizations_votes_track', '604800', '1', '1', '0', '1', 'bx_organizations_data', 'id', '', 'rate', 'votes', 'BxOrgsVote', 'modules/boonex/organizations/classes/BxOrgsVote.php');
 
 
 -- SCORES

+ 3 - 0
modules/boonex/russian/data/langs/bx_notifications/ru.xml

@@ -58,10 +58,13 @@
     <string name="_bx_ntfs_alert_action_doVote_personal"><![CDATA[Кто-то отдал голос вашему контенту]]></string>
     <string name="_bx_ntfs_alert_action_doVote_follow_member"><![CDATA[Новые голоса]]></string>
     <string name="_bx_ntfs_alert_action_doVote_follow_context"><![CDATA[Новые голоса]]></string>
+    <string name="_bx_ntfs_alert_action_fan_added_personal"><![CDATA[Новые фанаты]]></string>
     <string name="_bx_ntfs_alert_action_fan_added_follow_member"><![CDATA[Новые фанаты]]></string>
     <string name="_bx_ntfs_alert_action_fan_added_follow_context"><![CDATA[Новые фанаты]]></string>
+    <string name="_bx_ntfs_alert_action_join_request_personal"><![CDATA[Новые запросы на присоединение]]></string>
     <string name="_bx_ntfs_alert_action_join_request_follow_member"><![CDATA[Новые запросы на присоединение]]></string>
     <string name="_bx_ntfs_alert_action_join_request_follow_context"><![CDATA[Новые запросы на присоединение]]></string>
+    <string name="_bx_ntfs_alert_action_timeline_post_common_personal"><![CDATA[Новые сообщения на Ленте]]></string>
     <string name="_bx_ntfs_alert_action_timeline_post_common_follow_member"><![CDATA[Новые сообщения на Ленте]]></string>
     <string name="_bx_ntfs_alert_action_timeline_post_common_follow_context"><![CDATA[Новые сообщения на Ленте]]></string>