AntonLV 8 年 前
親
コミット
e5ed4175d9

+ 17 - 12
modules/base/groups/classes/BxBaseModGroupsModule.php

@@ -419,19 +419,24 @@ class BxBaseModGroupsModule extends BxBaseModProfileModule
         /*
          * Note. Group Profile URL is used for both Entry and Subentry URLs, 
          * because Subentry URL has higher display priority and notification
-         * should be linked to Group Profile instead of Personal Profile of
-         * a member, who performed an action.
+         * should be linked to Group Profile (Group Profile -> Members tab) 
+         * instead of Personal Profile of a member, who performed an action.
          */
-        $sEntryUrl = $sSubentryUrl = $oGroupProfile->getUrl();
-		return array(
-			'entry_sample' => $CNF['T']['txt_sample_single'],
-			'entry_url' => $sEntryUrl,
-			'entry_caption' => $oGroupProfile->getDisplayName(),
-			'entry_author' => $oGroupProfile->id(),
-			'subentry_sample' => $oProfile->getDisplayName(),
-			'subentry_url' => $sSubentryUrl,
-			'lang_key' => $sLangKey
-		);
+        $sEntryUrl = $oGroupProfile->getUrl();
+        if(!empty($CNF['URL_ENTRY_FANS']))
+            $sEntryUrl = BX_DOL_URL_ROOT . BxDolPermalinks::getInstance()->permalink($CNF['URL_ENTRY_FANS'], array(
+                'profile_id' => $oGroupProfile->id()
+            ));
+
+        return array(
+            'entry_sample' => $CNF['T']['txt_sample_single'],
+            'entry_url' => $sEntryUrl,
+            'entry_caption' => $oGroupProfile->getDisplayName(),
+            'entry_author' => $oGroupProfile->id(),
+            'subentry_sample' => $oProfile->getDisplayName(),
+            'subentry_url' => $sEntryUrl,
+            'lang_key' => $sLangKey
+        );
     }
 
     /**

+ 3 - 2
modules/boonex/events/classes/BxEventsConfig.php

@@ -67,8 +67,9 @@ class BxEventsConfig extends BxBaseModProfileConfig
         	'URI_MANAGE_COMMON' => 'events-manage',
 
             'URL_HOME' => 'page.php?i=events-home',
-        	'URL_MANAGE_COMMON' => 'page.php?i=events-manage',
-        	'URL_MANAGE_ADMINISTRATION' => 'page.php?i=events-administration',
+            'URL_ENTRY_FANS' => 'page.php?i=event-fans',
+            'URL_MANAGE_COMMON' => 'page.php?i=events-manage',
+            'URL_MANAGE_ADMINISTRATION' => 'page.php?i=events-administration',
 
             'PARAM_NUM_RSS' => 'bx_events_num_rss',
             'PARAM_NUM_CONNECTIONS_QUICK' => 'bx_events_num_connections_quick',

+ 3 - 2
modules/boonex/groups/classes/BxGroupsConfig.php

@@ -64,8 +64,9 @@ class BxGroupsConfig extends BxBaseModProfileConfig
         	'URI_MANAGE_COMMON' => 'groups-manage',
 
             'URL_HOME' => 'page.php?i=groups-home',
-        	'URL_MANAGE_COMMON' => 'page.php?i=groups-manage',
-        	'URL_MANAGE_ADMINISTRATION' => 'page.php?i=groups-administration',
+            'URL_ENTRY_FANS' => 'page.php?i=group-fans',
+            'URL_MANAGE_COMMON' => 'page.php?i=groups-manage',
+            'URL_MANAGE_ADMINISTRATION' => 'page.php?i=groups-administration',
 
             'PARAM_NUM_RSS' => 'bx_groups_num_rss',
             'PARAM_NUM_CONNECTIONS_QUICK' => 'bx_groups_num_connections_quick',

+ 4 - 3
modules/boonex/organizations/classes/BxOrgsConfig.php

@@ -68,9 +68,10 @@ class BxOrgsConfig extends BxBaseModProfileConfig
         	'URI_MANAGE_COMMON' => 'organizations-manage',
 
             'URL_HOME' => 'page.php?i=organizations-home',
-        	'URL_CREATE' => 'page.php?i=create-organization-profile',
-        	'URL_MANAGE_COMMON' => 'page.php?i=organizations-manage',
-        	'URL_MANAGE_ADMINISTRATION' => 'page.php?i=organizations-administration',
+            'URL_CREATE' => 'page.php?i=create-organization-profile',
+            'URL_ENTRY_FANS' => 'page.php?i=organization-profile-fans',
+            'URL_MANAGE_COMMON' => 'page.php?i=organizations-manage',
+            'URL_MANAGE_ADMINISTRATION' => 'page.php?i=organizations-administration',
 
             // some params
             'PARAM_AUTOAPPROVAL' => 'bx_organizations_autoapproval',

+ 1 - 0
modules/boonex/spaces/classes/BxSpacesConfig.php

@@ -66,6 +66,7 @@ class BxSpacesConfig extends BxBaseModProfileConfig
             'URI_MANAGE_COMMON' => 'spaces-manage',
 
             'URL_HOME' => 'page.php?i=spaces-home',
+            'URL_ENTRY_FANS' => 'page.php?i=space-fans',
             'URL_MANAGE_COMMON' => 'page.php?i=spaces-manage',
             'URL_MANAGE_ADMINISTRATION' => 'page.php?i=spaces-administration',