AntonLV 5 лет назад
Родитель
Сommit
3d88e877e7

+ 4 - 0
inc/classes/BxDolFavorite.php

@@ -49,6 +49,10 @@ class BxDolFavorite extends BxDolObject
 {
     protected $_sBaseUrl;
 
+    protected $_sFormObject;
+    protected $_sFormDisplayAdd;
+    protected $_sFormDisplayListEdit;
+
     protected function __construct($sSystem, $iId, $iInit = true, $oTemplate = false)
     {
         parent::__construct($sSystem, $iId, $iInit, $oTemplate);

+ 2 - 2
modules/boonex/market/install/sql/enable.sql

@@ -437,8 +437,8 @@ INSERT INTO `sys_objects_privacy` (`object`, `module`, `action`, `title`, `defau
 ('bx_market_allow_view_to', 'bx_market', 'view', '_bx_market_form_entry_input_allow_view_to', '3', 'all', 'bx_market_products', 'id', 'author', '', ''),
 ('bx_market_allow_purchase_to', 'bx_market', 'purchase', '_bx_market_form_entry_input_allow_purchase_to', '3', '', 'bx_market_products', 'id', 'author', '', ''),
 ('bx_market_allow_comment_to', 'bx_market', 'comment', '_bx_market_form_entry_input_allow_comment_to', 'c', '', 'bx_market_products', 'id', 'author', 'BxMarketPrivacy', 'modules/boonex/market/classes/BxMarketPrivacy.php'),
-('bx_market_allow_vote_to', 'bx_market', 'vote', '_bx_market_form_entry_input_allow_vote_to', 'c', '', 'bx_market_products', 'id', 'author', 'BxMarketPrivacy', 'modules/boonex/market/classes/BxMarketPrivacy.php');
-
+('bx_market_allow_vote_to', 'bx_market', 'vote', '_bx_market_form_entry_input_allow_vote_to', 'c', '', 'bx_market_products', 'id', 'author', 'BxMarketPrivacy', 'modules/boonex/market/classes/BxMarketPrivacy.php'),
+('bx_market_allow_view_favorite_list', 'bx_market', 'view_favorite_list', '_bx_market_form_entry_input_allow_view_favorite_list', '3', 'all', 'bx_market_favorites_lists', 'id', 'author_id', '', '');
 
 
 -- ACL

+ 4 - 5
template/scripts/BxBaseFavorite.php

@@ -269,15 +269,14 @@ class BxBaseFavorite extends BxDolFavorite
         $oForm->aInputs['list']['values'] = $aListsValues;
         $oForm->aInputs['list']['value'] = $this->_oQuery->getList(array('type' => 'object_and_author', 'object_id' => $iObjectId, 'author_id' => $iAuthorId));
         $oForm->aInputs['list']['label_as_html'] = true;
-        
-        
+
         $oModule = BxDolModule::getInstance($this->_aSystem["name"]);
         $CNF = $oModule->_oConfig->CNF;    
-       
+
         $oPrivacy = BxDolPrivacy::getObjectInstance($CNF["OBJECT_PRIVACY_LIST_VIEW"]);
         if(!$oPrivacy) 
-            return;
-        
+            return array('code' => 5, 'message' => _t('_favorite_err_cannot_perform_action'));
+
         $aSave = array('db' => array('pass' => 'Xss'));
         $aGroupChooser = $oPrivacy->getGroupChooser($CNF["OBJECT_PRIVACY_LIST_VIEW"]);
         $oForm->aInputs["allow_view_favorite_list_to"] = array_merge($oForm->aInputs["allow_view_favorite_list_to"], $aGroupChooser, $aSave);