Version Notes
Fixed toolbar issues on Magento 1.7
Download this release
Release Info
Developer | Magento Core Team |
Extension | Kreativkonzentrat_Glossary |
Version | 0.5.2 |
Comparing to | |
See all releases |
Code changes from version 0.5.1 to 0.5.2
- app/code/community/Kreativkonzentrat/Glossary/Block/Glossary/Toolbar.php +25 -0
- app/code/community/Kreativkonzentrat/Glossary/controllers/IndexController.php +1 -1
- app/code/community/Kreativkonzentrat/Glossary/etc/config.xml +1 -1
- app/design/frontend/base/default/layout/glossary.xml +6 -3
- app/design/frontend/base/default/template/glossary/toolbar.phtml +1 -1
- package.xml +5 -5
app/code/community/Kreativkonzentrat/Glossary/Block/Glossary/Toolbar.php
ADDED
@@ -0,0 +1,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1 |
+
<?php
|
2 |
+
class Kreativkonzentrat_Glossary_Block_Glossary_Toolbar extends Mage_Catalog_Block_Product_List_Toolbar
|
3 |
+
{
|
4 |
+
/**
|
5 |
+
* Set collection to pager
|
6 |
+
*
|
7 |
+
* @param Varien_Data_Collection $collection
|
8 |
+
* @return Mage_Catalog_Block_Product_List_Toolbar
|
9 |
+
*/
|
10 |
+
public function setCollection ($collection) {
|
11 |
+
$this->_collection = $collection;
|
12 |
+
|
13 |
+
$this->_collection->setCurPage($this->getCurrentPage());
|
14 |
+
|
15 |
+
// we need to set pagination only if passed value integer and more that 0
|
16 |
+
$limit = (int)$this->getLimit();
|
17 |
+
if ($limit) {
|
18 |
+
$this->_collection->setPageSize($limit);
|
19 |
+
}
|
20 |
+
if ($this->getCurrentOrder()) {
|
21 |
+
$this->_collection->setOrder('title', $this->getCurrentDirection());
|
22 |
+
}
|
23 |
+
return $this;
|
24 |
+
}
|
25 |
+
}
|
app/code/community/Kreativkonzentrat/Glossary/controllers/IndexController.php
CHANGED
@@ -14,7 +14,7 @@ class Kreativkonzentrat_Glossary_IndexController extends Mage_Core_Controller_Fr
|
|
14 |
->setOrder('title')
|
15 |
->setDefaultOrder('title')
|
16 |
->setCollection($glossary);
|
17 |
-
$this->getLayout()->getBlock('
|
18 |
->setCollection($glossary);
|
19 |
}
|
20 |
|
14 |
->setOrder('title')
|
15 |
->setDefaultOrder('title')
|
16 |
->setCollection($glossary);
|
17 |
+
$this->getLayout()->getBlock('glossary_toolbar_pager')
|
18 |
->setCollection($glossary);
|
19 |
}
|
20 |
|
app/code/community/Kreativkonzentrat/Glossary/etc/config.xml
CHANGED
@@ -19,7 +19,7 @@
|
|
19 |
</default>
|
20 |
<modules>
|
21 |
<Kreativkonzentrat_Glossary>
|
22 |
-
<version>0.5.
|
23 |
</Kreativkonzentrat_Glossary>
|
24 |
</modules>
|
25 |
<frontend>
|
19 |
</default>
|
20 |
<modules>
|
21 |
<Kreativkonzentrat_Glossary>
|
22 |
+
<version>0.5.2</version>
|
23 |
</Kreativkonzentrat_Glossary>
|
24 |
</modules>
|
25 |
<frontend>
|
app/design/frontend/base/default/layout/glossary.xml
CHANGED
@@ -21,6 +21,8 @@
|
|
21 |
<!--</reference>-->
|
22 |
</default>
|
23 |
|
|
|
|
|
24 |
<glossary_index_index>
|
25 |
|
26 |
<reference name="root">
|
@@ -28,12 +30,13 @@
|
|
28 |
<action method="setHeaderTitle" translate="title" module="glossary"><title>Glossary</title></action>
|
29 |
</reference>
|
30 |
<reference name="content">
|
31 |
-
<block type="
|
32 |
-
<block type="page/html_pager" name="
|
33 |
</block>
|
34 |
<block type="glossary/glossary_navigation" name="glossary_letter_navigation" template="glossary/letter/view.phtml"/>
|
35 |
<block type="glossary/glossary" name="glossary" template="glossary/glossary.phtml" />
|
36 |
-
|
|
|
37 |
</glossary_index_index>
|
38 |
|
39 |
<glossary_index_params>
|
21 |
<!--</reference>-->
|
22 |
</default>
|
23 |
|
24 |
+
|
25 |
+
|
26 |
<glossary_index_index>
|
27 |
|
28 |
<reference name="root">
|
30 |
<action method="setHeaderTitle" translate="title" module="glossary"><title>Glossary</title></action>
|
31 |
</reference>
|
32 |
<reference name="content">
|
33 |
+
<block type="glossary/glossary_toolbar" name="glossary_toolbar" template="glossary/toolbar.phtml">
|
34 |
+
<block type="page/html_pager" name="glossary_toolbar_pager" template="glossary/pager.phtml"/>
|
35 |
</block>
|
36 |
<block type="glossary/glossary_navigation" name="glossary_letter_navigation" template="glossary/letter/view.phtml"/>
|
37 |
<block type="glossary/glossary" name="glossary" template="glossary/glossary.phtml" />
|
38 |
+
</reference>
|
39 |
+
|
40 |
</glossary_index_index>
|
41 |
|
42 |
<glossary_index_params>
|
app/design/frontend/base/default/template/glossary/toolbar.phtml
CHANGED
@@ -28,4 +28,4 @@
|
|
28 |
</div>
|
29 |
<?php echo $this->getPagerHtml() ?>
|
30 |
</div>
|
31 |
-
</div>
|
28 |
</div>
|
29 |
<?php echo $this->getPagerHtml() ?>
|
30 |
</div>
|
31 |
+
</div>
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Kreativkonzentrat_Glossary</name>
|
4 |
-
<version>0.5.
|
5 |
<stability>stable</stability>
|
6 |
<license>OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Adds a glossary to your store</summary>
|
10 |
<description>The Glossary plugin for Magento allows you to easily add a glossary to your shop and links directly to glossary entries.</description>
|
11 |
-
<notes>Fixed Magento
|
12 |
<authors><author><name>Felix Moche</name><user>auto-converted</user><email>felix@kreativkonzentrat.de</email></author></authors>
|
13 |
-
<date>2012-
|
14 |
-
<time>
|
15 |
-
<contents><target name="magecommunity"><dir name="Kreativkonzentrat"><dir name="Glossary"><dir name="Block"><dir name="Adminhtml"><dir name="Glossary"><dir name="Edit"><dir name="Tab"><file name="Form.php" hash="6ab9cfff14d499f24bcb46cab74c313f"/></dir><file name="Form.php" hash="0fdbefdb7ae7a994c7c72481b0596b1f"/><file name="Tabs.php" hash="f2245c1684628bc56c471f60e9ef9a71"/></dir><file name="Edit.php" hash="d94e1d46e467aae746321a4fd1c95bd7"/><file name="Grid.php" hash="083d4fe4260a9a35fe2b75dd1a8304dc"/></dir><file name="Glossary.php" hash="9df63fd00059bdf3b8eae7f9be4a73ba"/></dir><dir name="Glossary"><file name="Navigation.php" hash="68b8007174bb7fc271fb5a53d807bbeb"/></dir><file name="Glossary.php" hash="9290dc4835357fb0bbe9e1bb0ab6178b"/></dir><dir name="Controller"><file name="Router.php" hash="e46ea43594c1e76d7d12418cbf2e3d90"/></dir><dir name="Helper"><file name="Data.php" hash="0bb8245a37153b5280bec9db389f9f32"/></dir><dir name="Model"><dir name="Adminhtml"><file name="Select.php" hash="ecf281379224f71b0a4ec2b24ab43da3"/></dir><dir name="Mysql4"><dir name="Glossary"><file name="Collection.php" hash="cb83b8dbc16e09d5506ad8cd9c2b8dd0"/></dir><file name="Glossary.php" hash="a0c7c07d246c22210b3b2bd5c2629432"/></dir><file name="Glossary.php" hash="c8766453bf025c1eac3674b00e78ac0f"/><file name="Page.php" hash="c507a9ff530939df51f0748ab1f64430"/><file name="Product.php" hash="4c15e30ad5fd5e0ad63e51ce712d9e16"/><file name="Status.php" hash="5a52b7fc5946f45425b85fa0ef86adce"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="GlossaryController.php" hash="e6f16cdf8faeab2e821508104262f1df"/></dir><file name="IndexController.php" hash="
|
16 |
<compatible/>
|
17 |
<dependencies/>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Kreativkonzentrat_Glossary</name>
|
4 |
+
<version>0.5.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license>OSL v3.0</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Adds a glossary to your store</summary>
|
10 |
<description>The Glossary plugin for Magento allows you to easily add a glossary to your shop and links directly to glossary entries.</description>
|
11 |
+
<notes>Fixed toolbar issues on Magento 1.7</notes>
|
12 |
<authors><author><name>Felix Moche</name><user>auto-converted</user><email>felix@kreativkonzentrat.de</email></author></authors>
|
13 |
+
<date>2012-11-08</date>
|
14 |
+
<time>17:14:45</time>
|
15 |
+
<contents><target name="magecommunity"><dir name="Kreativkonzentrat"><dir name="Glossary"><dir name="Block"><dir name="Adminhtml"><dir name="Glossary"><dir name="Edit"><dir name="Tab"><file name="Form.php" hash="6ab9cfff14d499f24bcb46cab74c313f"/></dir><file name="Form.php" hash="0fdbefdb7ae7a994c7c72481b0596b1f"/><file name="Tabs.php" hash="f2245c1684628bc56c471f60e9ef9a71"/></dir><file name="Edit.php" hash="d94e1d46e467aae746321a4fd1c95bd7"/><file name="Grid.php" hash="083d4fe4260a9a35fe2b75dd1a8304dc"/></dir><file name="Glossary.php" hash="9df63fd00059bdf3b8eae7f9be4a73ba"/></dir><dir name="Glossary"><file name="Navigation.php" hash="68b8007174bb7fc271fb5a53d807bbeb"/><file name="Toolbar.php" hash="73caf33dad188d868b3c329993526963"/></dir><file name="Glossary.php" hash="9290dc4835357fb0bbe9e1bb0ab6178b"/></dir><dir name="Controller"><file name="Router.php" hash="e46ea43594c1e76d7d12418cbf2e3d90"/></dir><dir name="Helper"><file name="Data.php" hash="0bb8245a37153b5280bec9db389f9f32"/></dir><dir name="Model"><dir name="Adminhtml"><file name="Select.php" hash="ecf281379224f71b0a4ec2b24ab43da3"/></dir><dir name="Mysql4"><dir name="Glossary"><file name="Collection.php" hash="cb83b8dbc16e09d5506ad8cd9c2b8dd0"/></dir><file name="Glossary.php" hash="a0c7c07d246c22210b3b2bd5c2629432"/></dir><file name="Glossary.php" hash="c8766453bf025c1eac3674b00e78ac0f"/><file name="Page.php" hash="c507a9ff530939df51f0748ab1f64430"/><file name="Product.php" hash="4c15e30ad5fd5e0ad63e51ce712d9e16"/><file name="Status.php" hash="5a52b7fc5946f45425b85fa0ef86adce"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="GlossaryController.php" hash="e6f16cdf8faeab2e821508104262f1df"/></dir><file name="IndexController.php" hash="28ee4946d858b480f567b6323f5c3e8c"/><file name="ViewController.php" hash="1427f3caf03620289ff2b70cc102a8bd"/></dir><dir name="etc"><file name="config.xml" hash="54ad711ec5955e8b7ca7d1944e09f9b7"/><file name="system.xml" hash="1d4e42aaccfd13d388056eb2938916a8"/></dir><dir name="sql"><dir name="glossary_setup"><file name="mysql4-install-0.5.1.php" hash="d19900a2c03411fcf4fb559007060134"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="glossary.xml" hash="56345facbc8a81b026d64fadbc6dafd1"/></dir><dir name="template"><dir name="glossary"><dir name="letter"><file name="view.phtml" hash="5bb0b80c315e17942c4326d9a77cc9c7"/></dir><file name="glossary.phtml" hash="a365c2b18a2fc8c322a453b387c4489d"/><file name="glossary_letter.phtml" hash="c734250b896932aacfb7ff8289436bde"/><file name="glossary_popup.phtml" hash="854f07d8fcea7ef649450e37cae4c199"/><file name="glossary_single.phtml" hash="afd557f0b958be793a57ad831f891756"/><file name="pager.phtml" hash="ff614fd4956d1fe352dda1fe8af5219c"/><file name="toolbar.phtml" hash="dfe367561f9513a79ddc61854e5f62a7"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="glossary.xml" hash="47479839622700bc80c6b7ecdf5d1844"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Kreativkonzentrat_Glossary.xml" hash="ae9bb531254247fcd1d628ae582e8b17"/></dir></target><target name="magelocale"><dir name="de_DE"><file name="Kreativkonzentrat_Glossary.csv" hash="f3f9ef70ef94af8f133f7abf56e5c1df"/></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies/>
|
18 |
</package>
|