Version Notes
*fixed pager/toolbar
Download this release
Release Info
Developer | Magento Core Team |
Extension | Kreativkonzentrat_Glossary |
Version | 0.5.6 |
Comparing to | |
See all releases |
Code changes from version 0.5.5 to 0.5.6
app/code/community/Kreativkonzentrat/Glossary/controllers/IndexController.php
CHANGED
@@ -14,13 +14,25 @@ class Kreativkonzentrat_Glossary_IndexController extends Mage_Core_Controller_Fr
|
|
14 |
*/
|
15 |
public function indexAction () {
|
16 |
$this->loadLayout();
|
17 |
-
$
|
18 |
-
if ($
|
19 |
-
$glossary = Mage::getModel('glossary/glossary')->load($
|
20 |
} else {
|
21 |
$glossary = Mage::getModel('glossary/glossary')->getFilteredCollection();
|
22 |
-
$this->getLayout()->getBlock('glossary_toolbar')
|
23 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
24 |
}
|
25 |
Mage::register('glossary', $glossary);
|
26 |
$this->renderLayout();
|
14 |
*/
|
15 |
public function indexAction () {
|
16 |
$this->loadLayout();
|
17 |
+
$glossaryId = $this->getRequest()->getParam('id');
|
18 |
+
if ($glossaryId != null && $glossaryId != '') {
|
19 |
+
$glossary = Mage::getModel('glossary/glossary')->load($glossaryId)->getData();
|
20 |
} else {
|
21 |
$glossary = Mage::getModel('glossary/glossary')->getFilteredCollection();
|
22 |
+
$toolbar = $this->getLayout()->getBlock('glossary_toolbar');
|
23 |
+
|
24 |
+
$toolbar->addOrderToAvailableOrders('title', 'Title')
|
25 |
+
->setOrder('title')
|
26 |
+
->setDefaultOrder('title')
|
27 |
+
->setCollection($glossary);
|
28 |
+
$pager = $this->getLayout()->getBlock('product_list_toolbar_pager');
|
29 |
+
$limits = $toolbar->getAvailableLimit();
|
30 |
+
$pagerLimit = array();
|
31 |
+
foreach ($limits as $_limit=>$value) {
|
32 |
+
$pagerLimit[] = (int)$value;
|
33 |
+
}
|
34 |
+
$pager->setAvailableLimit($pagerLimit);
|
35 |
+
$pager->setCollection($glossary);
|
36 |
}
|
37 |
Mage::register('glossary', $glossary);
|
38 |
$this->renderLayout();
|
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.6</version>
|
23 |
</Kreativkonzentrat_Glossary>
|
24 |
</modules>
|
25 |
<frontend>
|
app/design/frontend/base/default/layout/glossary.xml
CHANGED
@@ -30,9 +30,9 @@
|
|
30 |
<action method="setHeaderTitle" translate="title" module="glossary"><title>Glossary</title></action>
|
31 |
</reference>
|
32 |
<reference name="content">
|
33 |
-
|
34 |
-
|
35 |
-
|
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>
|
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="product_list_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>
|
package.xml
CHANGED
@@ -1,19 +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>*
|
12 |
-
*further improvements for image uploads</notes>
|
13 |
<authors><author><name>Felix Moche</name><user>auto-converted</user><email>felix@kreativkonzentrat.de</email></author></authors>
|
14 |
-
<date>2013-05-
|
15 |
-
<time>
|
16 |
-
<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="0effc4c7ddc0b403fa4ed8c54b598bf7"/></dir><file name="Form.php" hash="73571383488ae87a53cece22506f9633"/><file name="Tabs.php" hash="0c6ecb9e132401848ed2ea682e7c47d8"/></dir><file name="Edit.php" hash="3444d48517983c93c9ff5f5e6226dc5f"/><file name="Grid.php" hash="04d7fe7874e60891f02c69ee33cc7744"/></dir><file name="Glossary.php" hash="e8b8611c1dd2b6666e208bee5bc0a06b"/></dir><dir name="Glossary"><file name="Navigation.php" hash="f8c339fdf11ac38a6213104d5875a3f0"/><file name="Toolbar.php" hash="3d952901662c6d99e74d76ef2a16c6d7"/></dir><file name="Glossary.php" hash="79c571e1868bea0e5dc6f880e529bccc"/></dir><dir name="Controller"><file name="Router.php" hash="1c74519c5178d7682ab676f2ed4eec71"/></dir><dir name="
|
17 |
<compatible/>
|
18 |
<dependencies/>
|
19 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Kreativkonzentrat_Glossary</name>
|
4 |
+
<version>0.5.6</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 pager/toolbar</notes>
|
|
|
12 |
<authors><author><name>Felix Moche</name><user>auto-converted</user><email>felix@kreativkonzentrat.de</email></author></authors>
|
13 |
+
<date>2013-05-16</date>
|
14 |
+
<time>17:06:59</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="0effc4c7ddc0b403fa4ed8c54b598bf7"/></dir><file name="Form.php" hash="73571383488ae87a53cece22506f9633"/><file name="Tabs.php" hash="0c6ecb9e132401848ed2ea682e7c47d8"/></dir><file name="Edit.php" hash="3444d48517983c93c9ff5f5e6226dc5f"/><file name="Grid.php" hash="04d7fe7874e60891f02c69ee33cc7744"/></dir><file name="Glossary.php" hash="e8b8611c1dd2b6666e208bee5bc0a06b"/></dir><dir name="Glossary"><file name="Navigation.php" hash="f8c339fdf11ac38a6213104d5875a3f0"/><file name="Toolbar.php" hash="3d952901662c6d99e74d76ef2a16c6d7"/></dir><file name="Glossary.php" hash="79c571e1868bea0e5dc6f880e529bccc"/></dir><dir name="Controller"><file name="Router.php" hash="1c74519c5178d7682ab676f2ed4eec71"/></dir><dir name="Helper"><file name="Data.php" hash="4e69db77812c07b925f4be34b38a501c"/></dir><dir name="Model"><dir name="Adminhtml"><file name="Select.php" hash="21c76b12fee06db05aeedb7c71b0c5c8"/></dir><dir name="Mysql4"><dir name="Glossary"><file name="Collection.php" hash="16d8393128ba884ae94b93431cdfbcfc"/></dir><file name="Glossary.php" hash="075d8c09d782f9bcfe30bf06628c7d7f"/></dir><file name="Glossary.php" hash="cc27f83fb35f281470cc41400343a154"/><file name="Page.php" hash="aadf769ae1f2d01fa2ff2aad3b3c21fc"/><file name="Product.php" hash="cf191326f968425fd1cfd34848910752"/><file name="Status.php" hash="c356d5d8cd0c4c2e29b72b6483199949"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="GlossaryController.php" hash="80a8230e790cb5f4fa722dc2b0d84887"/></dir><file name="IndexController.php" hash="c111cc25b4ac1270eec114cf86e2e4f7"/><file name="ViewController.php" hash="14dc080ad5a937514d46cda4d56b5777"/></dir><dir name="etc"><file name="config.xml" hash="5f2b7418a5e7633cd5f9b639f05c1dd2"/><file name="system.xml" hash="1d4e42aaccfd13d388056eb2938916a8"/></dir><dir name="sql"><dir name="glossary_setup"><file name="mysql4-install-0.5.1.php" hash="cfa08f86f12be494153add2031642e0e"/><file name="mysql4-install-0.5.5.php" hash="1a23535af6a832f0412246b9c6888fe0"/></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="faf468990cd996b0ca09472122319370"/></dir><dir name="template"><dir name="glossary"><dir name="letter"><file name="view.phtml" hash="eb40266896912a17e2f53ec67a6f3a09"/></dir><file name="glossary.phtml" hash="f0c8072cbbdc1af7e02062f9c7f543e0"/><file name="glossary_letter.phtml" hash="018e520a7ac52bf9c9dc6737189b1729"/><file name="glossary_popup.phtml" hash="aa1cbf3c5f0b0eaa8561814486f2135b"/><file name="glossary_single.phtml" hash="c915593852832e8fde6dacb37f0b1789"/><file name="pager.phtml" hash="0b4458298810fc5fbb6988ba5e338fbb"/><file name="toolbar.phtml" hash="4d152db96a576b6d19013fa1497fb2dc"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="glossary.xml" hash="8cbd849137916a3e184417d2d2b26536"/></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>
|