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

Ticket #4492 - Market: Separate pages for category.

AntonLV пре 3 година
родитељ
комит
842d7239e6

+ 6 - 3
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -969,11 +969,14 @@ class BxBaseModGeneralModule extends BxDolModule
     public function serviceBrowseByCategory($sUnitView = false, $bEmptyMessage = true, $bAjaxPaginate = true, $bShowHeader = true)
     {
         $sType = 'category';
-        $iCategory = bx_process_input(bx_get('category'), BX_DATA_INT);
-        
+
+        $aParams = ['category' => bx_process_input(bx_get('category'), BX_DATA_INT)];
+        if($sUnitView)
+            $aParams['unit_view'] = $sUnitView;
+
         return $this->_serviceBrowse($sType, $aParams, BX_DB_PADDING_DEF, $bEmptyMessage, $bAjaxPaginate);
     }
-    
+
     /**
      * @page service Service Calls
      * @section bx_base_general Base General

+ 6 - 5
modules/boonex/market/classes/BxMarketSearchResult.php

@@ -25,6 +25,7 @@ class BxMarketSearchResult extends BxBaseModTextSearchResult
             'searchFields' => array(),
             'restriction' => array(
                 'author' => array('value' => '', 'field' => 'author', 'operator' => '='),
+                'category' => array('value' => '', 'field' => 'cat', 'operator' => '='),
                 'featured' => array('value' => '', 'field' => 'featured', 'operator' => '<>'),
                 'except' => array('value' => '', 'field' => 'id', 'operator' => 'not in'),
                 'status' => array('value' => 'active', 'field' => 'status', 'operator' => '='),
@@ -105,11 +106,11 @@ class BxMarketSearchResult extends BxBaseModTextSearchResult
                 break;
                 
              case 'category':
-                    $iCategory = (int)$aParams['category'];
-                    $this->addMarkers(array(
-                        'category_id' => $iCategory,
-                        'category_name' => BxDolCategory::getObjectInstance($CNF['OBJECT_CATEGORY'])->getCategoryTitle($iCategory),
-                    ));
+                $iCategory = (int)$aParams['category'];
+                $this->addMarkers([
+                    'category_id' => $iCategory,
+                    'category_name' => BxDolCategory::getObjectInstance($CNF['OBJECT_CATEGORY'])->getCategoryTitle($iCategory),
+                ]);
 
                 $this->aCurrent['restriction']['category']['value'] = $iCategory;
 

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

@@ -107,8 +107,8 @@ INSERT INTO `sys_objects_page`(`object`, `uri`, `title_system`, `title`, `module
 ('bx_market_category', 'products-category', '_bx_market_page_title_sys_entries_by_category', '_bx_market_page_title_entries_by_category', 'bx_market', 1, 2147483647, 1, 'page.php?i=products-category', '', '', '', 0, 1, 0, 'BxMarketPageBrowse', 'modules/boonex/market/classes/BxMarketPageBrowse.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_market_category', 2, 'bx_market', '_bx_market_page_block_title_sys_entries_by_category', '_bx_market_page_block_title_entries_by_category', 11, 2147483647, 'service', 'a:3:{s:6:"module";s:9:"bx_market";s:6:"method";s:18:"browse_by_category";s:6:"params";a:1:{i:0;s:5:"table";}}', 0, 0, 1, 1),
-('bx_market_category', 1, 'bx_market', '_bx_market_page_block_title_cats', '_bx_market_page_block_title_cats', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"categories_list";s:6:"params";a:2:{i:0;s:14:"bx_market_cats";i:1;a:1:{s:10:"show_empty";b:1;}}s:5:"class";s:20:"TemplServiceCategory";}', 0, 0, 1, 1);
+('bx_market_category', 1, 'bx_market', '_bx_market_page_block_title_cats', '_bx_market_page_block_title_cats', 11, 2147483647, 'service', 'a:4:{s:6:"module";s:6:"system";s:6:"method";s:15:"categories_list";s:6:"params";a:2:{i:0;s:14:"bx_market_cats";i:1;a:1:{s:10:"show_empty";b:1;}}s:5:"class";s:20:"TemplServiceCategory";}', 0, 0, 1, 1),
+('bx_market_category', 2, 'bx_market', '_bx_market_page_block_title_sys_entries_by_category', '_bx_market_page_block_title_entries_by_category', 11, 2147483647, 'service', 'a:2:{s:6:"module";s:9:"bx_market";s:6:"method";s:18:"browse_by_category";}', 0, 0, 1, 1);
 
 -- PAGE: latest entries
 INSERT INTO `sys_objects_page`(`object`, `title_system`, `title`, `module`, `layout_id`, `visible_for_levels`, `visible_for_levels_editable`, `uri`, `url`, `meta_description`, `meta_keywords`, `meta_robots`, `cache_lifetime`, `cache_editable`, `deletable`, `override_class_name`, `override_class_file`) VALUES