Ver Fonte

Ticket #4340 - Menus: Allow to filter out items depending on context. Usage.

AntonLV há 3 anos atrás
pai
commit
2eeb0fa15e

+ 0 - 1
modules/boonex/channels/classes/BxCnlMenuSnippetMeta.php

@@ -17,7 +17,6 @@ class BxCnlMenuSnippetMeta extends BxBaseModGroupsMenuSnippetMeta
         parent::__construct($aObject, $oTemplate);
         parent::__construct($aObject, $oTemplate);
 
 
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
-        unset($this->_aConnectionToFunctionTitle['sys_profiles_friends']);
     }
     }
 }
 }
 
 

+ 6 - 0
modules/boonex/courses/classes/BxCoursesConfig.php

@@ -232,6 +232,12 @@ class BxCoursesConfig extends BxBaseModGroupsConfig
                 'menu_item_title_leave_group_cancel_request' => '_bx_courses_menu_item_title_leave_entry_cancel_request',
                 'menu_item_title_leave_group_cancel_request' => '_bx_courses_menu_item_title_leave_entry_cancel_request',
                 'menu_item_title_become_fan' => '_bx_courses_menu_item_title_become_fan',
                 'menu_item_title_become_fan' => '_bx_courses_menu_item_title_become_fan',
                 'menu_item_title_leave_group' => '_bx_courses_menu_item_title_leave_entry',
                 'menu_item_title_leave_group' => '_bx_courses_menu_item_title_leave_entry',
+                'menu_item_title_sm_join' => '_bx_courses_menu_item_title_sm_join',
+                'menu_item_title_sm_join_paid' => '_bx_courses_menu_item_title_sm_join_paid',
+                'menu_item_title_sm_join_confirm' => '_bx_courses_menu_item_title_sm_join_confirm',
+                'menu_item_title_sm_leave' => '_bx_courses_menu_item_title_sm_leave',
+                'menu_item_title_sm_leave_cancel' => '_bx_courses_menu_item_title_sm_leave_cancel',
+                'menu_item_title_sm_leave_reject' => '_bx_courses_menu_item_title_sm_leave_reject',
                 'txt_all_entries_by_author' => '_bx_courses_page_title_browse_by_author',
                 'txt_all_entries_by_author' => '_bx_courses_page_title_browse_by_author',
                 'txt_invitation_popup_title' => '_bx_courses_txt_invite_popup_title',
                 'txt_invitation_popup_title' => '_bx_courses_txt_invite_popup_title',
                 'txt_invitation_popup_text' => '_bx_courses_txt_invite_popup_text',
                 'txt_invitation_popup_text' => '_bx_courses_txt_invite_popup_text',

+ 0 - 31
modules/boonex/courses/classes/BxCoursesMenuSnippetMeta.php

@@ -18,37 +18,6 @@ class BxCoursesMenuSnippetMeta extends BxBaseModGroupsMenuSnippetMeta
         parent::__construct($aObject, $oTemplate);
         parent::__construct($aObject, $oTemplate);
 
 
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
-        unset($this->_aConnectionToFunctionTitle['sys_profiles_friends']);
-    }
-
-    protected function _getMenuItemConnectionsTitle($sAction, &$oConnection)
-    {
-        $iProfile = bx_get_logged_profile_id();
-        $iContentProfile = $this->_oContentProfile->id();
-
-        $aResult = array();
-        if($oConnection->isConnectedNotMutual($iProfile, $iContentProfile))
-            $aResult = array(
-                'add' => '',
-                'remove' => _t('_bx_courses_menu_item_title_sm_leave_cancel'),
-            );
-        else if($oConnection->isConnectedNotMutual($iContentProfile, $iProfile))
-            $aResult = array(
-                'add' => _t('_bx_courses_menu_item_title_sm_join_confirm'),
-                'remove' => _t('_bx_courses_menu_item_title_sm_leave_reject'),
-            );
-        else if($oConnection->isConnected($iProfile, $iContentProfile, true))
-            $aResult = array(
-                'add' => '',
-                'remove' => _t('_bx_courses_menu_item_title_sm_leave'),
-            );
-        else
-            $aResult = array(
-                'add' => _t('_bx_courses_menu_item_title_sm_join'),
-                'remove' => '',
-            );
-
-        return !empty($sAction) && isset($aResult[$sAction]) ? $aResult[$sAction] : $aResult;
     }
     }
 }
 }
 
 

+ 1 - 0
modules/boonex/courses/install/langs/en.xml

@@ -304,6 +304,7 @@
     <string name="_bx_courses_menu_item_title_sm_members"><![CDATA[{0} students]]></string>
     <string name="_bx_courses_menu_item_title_sm_members"><![CDATA[{0} students]]></string>
     <string name="_bx_courses_menu_item_title_system_sm_join"><![CDATA[Attend]]></string>
     <string name="_bx_courses_menu_item_title_system_sm_join"><![CDATA[Attend]]></string>
     <string name="_bx_courses_menu_item_title_sm_join"><![CDATA[Attend]]></string>
     <string name="_bx_courses_menu_item_title_sm_join"><![CDATA[Attend]]></string>
+    <string name="_bx_courses_menu_item_title_sm_join_paid"><![CDATA[Pay & Attend]]></string>
     <string name="_bx_courses_menu_item_title_sm_join_confirm"><![CDATA[Accept attend request]]></string>
     <string name="_bx_courses_menu_item_title_sm_join_confirm"><![CDATA[Accept attend request]]></string>
     <string name="_bx_courses_menu_item_title_sm_leave"><![CDATA[Leave]]></string>
     <string name="_bx_courses_menu_item_title_sm_leave"><![CDATA[Leave]]></string>
     <string name="_bx_courses_menu_item_title_sm_leave_reject"><![CDATA[Reject attend request]]></string>
     <string name="_bx_courses_menu_item_title_sm_leave_reject"><![CDATA[Reject attend request]]></string>

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

@@ -18,7 +18,6 @@ class BxEventsMenuSnippetMeta extends BxBaseModGroupsMenuSnippetMeta
         parent::__construct($aObject, $oTemplate);
         parent::__construct($aObject, $oTemplate);
 
 
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
-        unset($this->_aConnectionToFunctionTitle['sys_profiles_friends']);
     }
     }
 
 
     protected function _getMenuItemDateStart($aItem)
     protected function _getMenuItemDateStart($aItem)

+ 0 - 1
modules/boonex/groups/classes/BxGroupsMenuSnippetMeta.php

@@ -18,7 +18,6 @@ class BxGroupsMenuSnippetMeta extends BxBaseModGroupsMenuSnippetMeta
         parent::__construct($aObject, $oTemplate);
         parent::__construct($aObject, $oTemplate);
 
 
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
-        unset($this->_aConnectionToFunctionTitle['sys_profiles_friends']);
     }
     }
 }
 }
 
 

+ 1 - 0
modules/boonex/russian/data/langs/bx_courses/ru.xml

@@ -303,6 +303,7 @@
     <string name="_bx_courses_menu_item_title_sm_members"><![CDATA[{0} студенты]]></string>
     <string name="_bx_courses_menu_item_title_sm_members"><![CDATA[{0} студенты]]></string>
     <string name="_bx_courses_menu_item_title_system_sm_join"><![CDATA[Посетить]]></string>
     <string name="_bx_courses_menu_item_title_system_sm_join"><![CDATA[Посетить]]></string>
     <string name="_bx_courses_menu_item_title_sm_join"><![CDATA[Посетить]]></string>
     <string name="_bx_courses_menu_item_title_sm_join"><![CDATA[Посетить]]></string>
+    <string name="_bx_courses_menu_item_title_sm_join_paid"><![CDATA[Оплатить и посетить]]></string>
     <string name="_bx_courses_menu_item_title_sm_join_confirm"><![CDATA[Принять запрос на посещение]]></string>
     <string name="_bx_courses_menu_item_title_sm_join_confirm"><![CDATA[Принять запрос на посещение]]></string>
     <string name="_bx_courses_menu_item_title_sm_leave"><![CDATA[Покинуть]]></string>
     <string name="_bx_courses_menu_item_title_sm_leave"><![CDATA[Покинуть]]></string>
     <string name="_bx_courses_menu_item_title_sm_leave_reject"><![CDATA[Отклонить запрос на посещение]]></string>
     <string name="_bx_courses_menu_item_title_sm_leave_reject"><![CDATA[Отклонить запрос на посещение]]></string>

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

@@ -18,7 +18,6 @@ class BxSpacesMenuSnippetMeta extends BxBaseModGroupsMenuSnippetMeta
         parent::__construct($aObject, $oTemplate);
         parent::__construct($aObject, $oTemplate);
 
 
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
         unset($this->_aConnectionToFunctionCheck['sys_profiles_friends']);
-        unset($this->_aConnectionToFunctionTitle['sys_profiles_friends']);
     }
     }
 
 
     protected function _getMenuItemParent($aItem)
     protected function _getMenuItemParent($aItem)