Changeset 13151 for trunk/templates/base/scripts/BxBaseSearchResult.php

Timestamp:

11/06/09 00:33:47 (3 years ago)

Author:

Alexander Ermashev

Message:

• ticket #1413;

File:

• trunk/templates/base/scripts/BxBaseSearchResult.php (modified) (3 diffs)

trunk/templates/base/scripts/BxBaseSearchResult.php

@@ -157 +157 @@
     }
 
-    function showPagination($bAdmin = false) {
+    function showPagination($bAdmin = false, $bChangePage = true, $bPageReload = true) {
+        $sPageLink = $this->getCurrentUrl('browseAll', 0, '');
         $aLinkAddon = $this->getLinkAddByPrams();
+
+        if($aLinkAddon) {
+           foreach($aLinkAddon as $mKey => $sValue)
+           {
+                $sPageLink .= $sValue;
+           }   
+        }
+ 
+        if(!$this->id) {
+            $this->id = 0;
+        }
+    
         $oPaginate = new BxDolPaginate(array(
-            'page_url' => $this->getCurrentUrl('browseAll', 0, ''),
+            'page_url' => $sPageLink,
             'count' => $this->aCurrent['paginate']['totalNum'],
             'per_page' => $this->aCurrent['paginate']['perPage'],
@@ -166 +179 @@
             'per_page_changer' => true,
             'page_reloader' => true,
-            'on_change_page' => 'return !loadDynamicBlock('.$this->id.', \'searchKeywordContent.php?searchMode=ajax&section[]='.$this->aCurrent['name'].'&keyword='.process_pass_data($_REQUEST['keyword']).$aLinkAddon['params'].'&page={page}&per_page={per_page}\');',
-            'on_change_per_page' => 'return !loadDynamicBlock('.$this->id.', \'searchKeywordContent.php?searchMode=ajax&section[]='.$this->aCurrent['name'].'&keyword='.process_pass_data($_REQUEST['keyword']).$aLinkAddon['params'].'&page=1&per_page=\' + this.value);'
+            'on_change_page' => !$bPageReload ? '' : 'return !loadDynamicBlock('.$this->id.', \'searchKeywordContent.php?searchMode=ajax&section[]='.$this->aCurrent['name'].'&keyword='.process_pass_data($_REQUEST['keyword']).$aLinkAddon['params'].'&page={page}&per_page={per_page}\');',
+            'on_change_per_page' => !$bChangePage ? '' : 'return !loadDynamicBlock('.$this->id.', \'searchKeywordContent.php?searchMode=ajax&section[]='.$this->aCurrent['name'].'&keyword='.process_pass_data($_REQUEST['keyword']).$aLinkAddon['params'].'&page=1&per_page=\' + this.value);'
         ));
         $sPaginate = '<div class="clear_both"></div>'.$oPaginate->getPaginate();
@@ -198 +211 @@
         }
         //paginate
-        $aLinks['paginate'] .= '&page='.$this->aCurrent['paginate']['page'];
-        $aLinks['paginate'] .= '&per_page='.$this->aCurrent['paginate']['perPage'];
+        $aLinks['paginate'] .= '&page={page}';
+        $aLinks['paginate'] .= '&per_page={per_page}';
         return $aLinks;
     }