Activated_Slider - Version 1.0.6

Version Notes

- Added support for table prefix
- Tested on PHP 5.5.19

Download this release

Release Info

Developer Activated Apps
Extension Activated_Slider
Version 1.0.6
Comparing to
See all releases


Code changes from version 1.0.5 to 1.0.6

Files changed (5) hide show
  1. app/code/community/Activated/Slider/Block/Adminhtml/Slider/Edit/Tab/Banner.php +6 -3
  2. app/code/community/Activated/Slider/Block/Banner.php +4 -2
  3. app/code/community/Activated/Slider/Block/Slider.php +3 -3
  4. app/code/community/Activated/Slider/Helper/Admin.php +4 -0
  5. package.xml +7 -6
app/code/community/Activated/Slider/Block/Adminhtml/Slider/Edit/Tab/Banner.php CHANGED
@@ -29,6 +29,9 @@ implements Mage_Adminhtml_Block_Widget_Tab_Interface
29
  protected function _prepareCollection()
30
  {
31
  $sliderId = Mage::registry('slider')->getId();
 
 
 
32
 
33
  if (empty($sliderId)) {
34
  $sliderId = '0';
@@ -36,9 +39,9 @@ implements Mage_Adminhtml_Block_Widget_Tab_Interface
36
 
37
  $collection = Mage::getModel('slider/banner')->getCollection();
38
  $collection->getSelect()
39
- ->joinLeft('activated_reference',
40
- 'main_table.banner_id = activated_reference.banner_id && ' . $sliderId . ' = activated_reference.slider_id',
41
- array('activated_reference.position'));
42
  $this->setCollection($collection);
43
  return parent::_prepareCollection();
44
  }
29
  protected function _prepareCollection()
30
  {
31
  $sliderId = Mage::registry('slider')->getId();
32
+ //$prefix = Mage::getConfig()->getTablePrefix();
33
+ $reference_table = Mage::helper('slider/admin')->getTable('slider/reference');
34
+ Mage::log($reference_table, null, 'banner.log');
35
 
36
  if (empty($sliderId)) {
37
  $sliderId = '0';
39
 
40
  $collection = Mage::getModel('slider/banner')->getCollection();
41
  $collection->getSelect()
42
+ ->joinLeft($reference_table,
43
+ 'main_table.banner_id = ' . $reference_table . '.banner_id && ' . $sliderId . ' = ' . $reference_table . '.slider_id',
44
+ array($reference_table . '.position'));
45
  $this->setCollection($collection);
46
  return parent::_prepareCollection();
47
  }
app/code/community/Activated/Slider/Block/Banner.php CHANGED
@@ -30,11 +30,13 @@ class Activated_Slider_Block_Banner extends Mage_Core_Block_Template
30
  */
31
  public function getCollection()
32
  {
 
 
33
  if (is_null($this->_bannerCollection)) {
34
  $this->_bannerCollection = $this->_getCollection();
35
  $this->_bannerCollection->getSelect()
36
- ->join('activated_reference',
37
- 'main_table.banner_id = activated_reference.banner_id and activated_reference.slider_id = "' . $this->_id . '"'
38
  );
39
  }
40
 
30
  */
31
  public function getCollection()
32
  {
33
+ $reference_table = Mage::helper('slider/admin')->getTable('slider/reference');
34
+
35
  if (is_null($this->_bannerCollection)) {
36
  $this->_bannerCollection = $this->_getCollection();
37
  $this->_bannerCollection->getSelect()
38
+ ->join($reference_table,
39
+ 'main_table.banner_id = ' . $reference_table . '.banner_id and ' . $reference_table '.slider_id = "' . $this->_id . '"'
40
  );
41
  }
42
 
app/code/community/Activated/Slider/Block/Slider.php CHANGED
@@ -36,7 +36,6 @@ class Activated_Slider_Block_Slider extends Mage_Core_Block_Template
36
  if (Mage::helper('slider')->isEnabled()) {
37
  $html = parent::_toHtml();
38
  $this->setId($this->getSliderId());
39
- Mage::log('To HTML hit', null, 'banner.log');
40
  return $html;
41
  }
42
  }
@@ -64,6 +63,7 @@ class Activated_Slider_Block_Slider extends Mage_Core_Block_Template
64
  public function getBanners()
65
  {
66
  $sliderId = $this->getSliderId();
 
67
 
68
  // Check for block tag slider id
69
  if ($sliderId) {
@@ -73,8 +73,8 @@ class Activated_Slider_Block_Slider extends Mage_Core_Block_Template
73
  if (is_null($this->_bannerCollection)) {
74
  $this->_bannerCollection = $this->_getBanners();
75
  $this->_bannerCollection->getSelect()
76
- ->join('activated_reference',
77
- 'main_table.banner_id = activated_reference.banner_id and activated_reference.slider_id = "' . $this->_id . '"'
78
  )
79
  ->order('position');
80
  }
36
  if (Mage::helper('slider')->isEnabled()) {
37
  $html = parent::_toHtml();
38
  $this->setId($this->getSliderId());
 
39
  return $html;
40
  }
41
  }
63
  public function getBanners()
64
  {
65
  $sliderId = $this->getSliderId();
66
+ $reference_table = Mage::helper('slider/admin')->getTable('slider/reference');
67
 
68
  // Check for block tag slider id
69
  if ($sliderId) {
73
  if (is_null($this->_bannerCollection)) {
74
  $this->_bannerCollection = $this->_getBanners();
75
  $this->_bannerCollection->getSelect()
76
+ ->join($reference_table,
77
+ 'main_table.banner_id = ' . $reference_table . '.banner_id and ' . $reference_table . '.slider_id = "' . $this->_id . '"'
78
  )
79
  ->order('position');
80
  }
app/code/community/Activated/Slider/Helper/Admin.php CHANGED
@@ -13,4 +13,8 @@ class Activated_Slider_Helper_Admin extends Mage_Core_Helper_Abstract
13
  {
14
  return Mage::getSingleton('admin/session')->isAllowed('slider/manage/' . $action);
15
  }
 
 
 
 
16
  }
13
  {
14
  return Mage::getSingleton('admin/session')->isAllowed('slider/manage/' . $action);
15
  }
16
+
17
+ public function getTable($table) {
18
+ return Mage::getSingleton('core/resource')->getTableName($table);
19
+ }
20
  }
package.xml CHANGED
@@ -1,18 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Activated_Slider</name>
4
- <version>1.0.5</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.activatedapps.com/legal/LICENSE.pdf">EULA</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Slider manager with responsive capabilities.</summary>
10
  <description>The Activated Slider gives the ability to easily manage banners on your site. Sliders are responsive out of the box. Static content is also supported by adding a single banner. Allows placement of multiple sliders on a single page. This extension is geared toward developers looking for flexible solutions to customize to fit their clients needs.</description>
11
- <notes>- Changed caption column character count</notes>
 
12
  <authors><author><name>Activated Apps</name><user>Owner</user><email>admin@activatedapps.com</email></author></authors>
13
- <date>2014-10-16</date>
14
- <time>19:24:59</time>
15
- <contents><target name="magecommunity"><dir name="Activated"><dir name="Slider"><dir name="Block"><dir name="Adminhtml"><dir name="Banner"><dir name="Edit"><dir name="Form"><dir name="Element"><file name="Image.php" hash="ea3ac4a46558460e58c0c27f92618409"/></dir></dir><file name="Form.php" hash="8258bde97d53b5f5d935940e6e0a517f"/><dir name="Tab"><file name="Content.php" hash="2fe0c7b1da8c3ceabfd1fa67d73ad20e"/><file name="Image.php" hash="91220ba52d24a1ecafc0c9530b4c0593"/><file name="Main.php" hash="a5fa3afdafa3f4db6cfd1f12152220fa"/></dir><file name="Tabs.php" hash="5895a9cf8a444f838c2ce6b80d2fdfe0"/></dir><file name="Edit.php" hash="fef86569554bc0580d04e9ac1ffafbba"/><file name="Grid.php" hash="aba8a9c760f8d2bcb92b26b02344102b"/></dir><file name="Banner.php" hash="1e9fbba385b035703a618143d0a5d769"/><dir name="Slider"><dir name="Edit"><file name="Form.php" hash="23d7549d1d55d27f546082106e94aee0"/><dir name="Tab"><file name="Banner.php" hash="4b67c3ba0e2d56f16216706fd243f884"/><file name="Main.php" hash="d142f53468c15bbe767c9ac434b2b885"/></dir><file name="Tabs.php" hash="5155b7d96696ca345a982237b48d4abb"/></dir><file name="Edit.php" hash="fba8c7956fc0e0294fc782f1c03b5cb2"/><file name="Grid.php" hash="c920b16358b7492797e0dff2f1c84046"/></dir><file name="Slider.php" hash="708da1ce7c3809e1fc0d9f71fce49922"/></dir><file name="Banner.php" hash="e684150c076e689f5c803aa5a9391099"/><file name="Slider.php" hash="76f9db7ec6e2773a793c0a70692223d8"/></dir><dir name="Helper"><file name="Admin.php" hash="1318d0328ce00d0f5dac5b69f8f3b028"/><file name="Data.php" hash="916fb7995484b745b9270c43652e76df"/><file name="Image.php" hash="4e4581cdbaf9c8b8cf5a4f0f72ff71df"/></dir><dir name="Model"><file name="Banner.php" hash="3c5730aaeb7b62d9059491bedd51129c"/><file name="Reference.php" hash="f6439ddcc8e26bcaabbcfb691bd52bad"/><dir name="Resource"><dir name="Banner"><file name="Collection.php" hash="05856672ba50c36dc0f0e56ebac9322e"/></dir><file name="Banner.php" hash="22c1982f1f4dff6499b04ebdf50bbd44"/><dir name="Reference"><file name="Collection.php" hash="c624a2c75632d15be90a72ec4dbef880"/></dir><file name="Reference.php" hash="cdba9d91f54620a19fb926f4bd324a70"/><file name="Setup.php" hash="976fb2f6fee271c79bd354b4589614e2"/><dir name="Slider"><file name="Collection.php" hash="b765daae20a7fcc90bbc0fd19ee69451"/></dir><file name="Slider.php" hash="f4f19b4e4e0550df7db4852daa72cc00"/></dir><file name="Slider.php" hash="9730d496296f2378eca2a3dca9a37a85"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="BannerController.php" hash="fca4afcfa07db180b914e14b59165d2a"/><file name="SliderController.php" hash="4f4c9b2555ed96a7cd48ae0662d68d51"/></dir><file name="IndexController.php" hash="6fe946325caa97ba960a849ead735468"/></dir><dir name="etc"><file name="adminhtml.xml" hash="603674d2558837cd44bfaa303f828b07"/><file name="config.xml" hash="2dd9f99c6fffaf18de0df5e721fcc434"/><file name="system.xml" hash="c73d8e4ddeb42c83e89602952d50cdc6"/><file name="widget.xml" hash="aaf36d835827c9fa5c9adcba9dbb9f8e"/></dir><dir name="sql"><dir name="slider_setup"><file name="install-1.0.0.php" hash="bddc314f836ac89834648367a3215f8d"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Activated_Slider.xml" hash="587768b668fb39f9583b591e8747ae2e"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="activated_slider.xml" hash="dff868303051d8c8cf0cf85c88a9feca"/></dir><dir name="template"><dir name="slider"><file name="form.phtml" hash="1d9cc10eb69eb23d385fc0b921ddb7d8"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="activated_slider.xml" hash="4395e9f4841bd375a88895fea3832a0d"/></dir><dir name="template"><dir name="activated"><dir name="slider"><file name="banner.phtml" hash="a57ee3d4d1e3d10c80c77f8a9b72c447"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="activated"><dir name="slider"><file name="flexslider.css" hash="6f7dc85d174d9f4e6e18198e888513bf"/><dir name="fonts"><file name="flexslider-icon.eot" hash="9c9cb7a6055043933ba68854f521af45"/><file name="flexslider-icon.svg" hash="10e8a5455c4522c48aa975eacd4f0023"/><file name="flexslider-icon.ttf" hash="b4c9e5057989b9727a5df4e0a21af33c"/><file name="flexslider-icon.woff" hash="f8b92f66539473eea649c8514eb836a0"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="activated"><dir name="slider"><file name="banner.js" hash="ac0daf7f9f84a32e2f641570fccf3951"/><file name="jquery.flexslider-min.js" hash="850417bf7853c0623933a47243cb3a5a"/><file name="jquery.js" hash="9e0fc95e071e2914ddbcdfe0fcd76d70"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
- <dependencies><required><php><min>5.2.17</min><max>5.5.5</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Activated_Slider</name>
4
+ <version>1.0.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.activatedapps.com/legal/LICENSE.pdf">EULA</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Slider manager with responsive capabilities.</summary>
10
  <description>The Activated Slider gives the ability to easily manage banners on your site. Sliders are responsive out of the box. Static content is also supported by adding a single banner. Allows placement of multiple sliders on a single page. This extension is geared toward developers looking for flexible solutions to customize to fit their clients needs.</description>
11
+ <notes>- Added support for table prefix&#xD;
12
+ - Tested on PHP 5.5.19</notes>
13
  <authors><author><name>Activated Apps</name><user>Owner</user><email>admin@activatedapps.com</email></author></authors>
14
+ <date>2014-12-16</date>
15
+ <time>18:47:10</time>
16
+ <contents><target name="magecommunity"><dir name="Activated"><dir name="Slider"><dir name="Block"><dir name="Adminhtml"><dir name="Banner"><dir name="Edit"><dir name="Form"><dir name="Element"><file name="Image.php" hash="ea3ac4a46558460e58c0c27f92618409"/></dir></dir><file name="Form.php" hash="8258bde97d53b5f5d935940e6e0a517f"/><dir name="Tab"><file name="Content.php" hash="2fe0c7b1da8c3ceabfd1fa67d73ad20e"/><file name="Image.php" hash="91220ba52d24a1ecafc0c9530b4c0593"/><file name="Main.php" hash="a5fa3afdafa3f4db6cfd1f12152220fa"/></dir><file name="Tabs.php" hash="5895a9cf8a444f838c2ce6b80d2fdfe0"/></dir><file name="Edit.php" hash="fef86569554bc0580d04e9ac1ffafbba"/><file name="Grid.php" hash="aba8a9c760f8d2bcb92b26b02344102b"/></dir><file name="Banner.php" hash="1e9fbba385b035703a618143d0a5d769"/><dir name="Slider"><dir name="Edit"><file name="Form.php" hash="23d7549d1d55d27f546082106e94aee0"/><dir name="Tab"><file name="Banner.php" hash="ede6a6d1f7b22a89d837a6aa182c5546"/><file name="Main.php" hash="d142f53468c15bbe767c9ac434b2b885"/></dir><file name="Tabs.php" hash="5155b7d96696ca345a982237b48d4abb"/></dir><file name="Edit.php" hash="fba8c7956fc0e0294fc782f1c03b5cb2"/><file name="Grid.php" hash="c920b16358b7492797e0dff2f1c84046"/></dir><file name="Slider.php" hash="708da1ce7c3809e1fc0d9f71fce49922"/></dir><file name="Banner.php" hash="32e71a84426bbee20d3b18b3bde9e9d4"/><file name="Slider.php" hash="43ba1e4953439e67f329216e3a0d7477"/></dir><dir name="Helper"><file name="Admin.php" hash="363f74809079f7a5bef498e0bc6ee03c"/><file name="Data.php" hash="916fb7995484b745b9270c43652e76df"/><file name="Image.php" hash="4e4581cdbaf9c8b8cf5a4f0f72ff71df"/></dir><dir name="Model"><file name="Banner.php" hash="3c5730aaeb7b62d9059491bedd51129c"/><file name="Reference.php" hash="f6439ddcc8e26bcaabbcfb691bd52bad"/><dir name="Resource"><dir name="Banner"><file name="Collection.php" hash="05856672ba50c36dc0f0e56ebac9322e"/></dir><file name="Banner.php" hash="22c1982f1f4dff6499b04ebdf50bbd44"/><dir name="Reference"><file name="Collection.php" hash="c624a2c75632d15be90a72ec4dbef880"/></dir><file name="Reference.php" hash="cdba9d91f54620a19fb926f4bd324a70"/><file name="Setup.php" hash="976fb2f6fee271c79bd354b4589614e2"/><dir name="Slider"><file name="Collection.php" hash="b765daae20a7fcc90bbc0fd19ee69451"/></dir><file name="Slider.php" hash="f4f19b4e4e0550df7db4852daa72cc00"/></dir><file name="Slider.php" hash="9730d496296f2378eca2a3dca9a37a85"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="BannerController.php" hash="fca4afcfa07db180b914e14b59165d2a"/><file name="SliderController.php" hash="4f4c9b2555ed96a7cd48ae0662d68d51"/></dir><file name="IndexController.php" hash="6fe946325caa97ba960a849ead735468"/></dir><dir name="etc"><file name="adminhtml.xml" hash="603674d2558837cd44bfaa303f828b07"/><file name="config.xml" hash="2dd9f99c6fffaf18de0df5e721fcc434"/><file name="system.xml" hash="c73d8e4ddeb42c83e89602952d50cdc6"/><file name="widget.xml" hash="aaf36d835827c9fa5c9adcba9dbb9f8e"/></dir><dir name="sql"><dir name="slider_setup"><file name="install-1.0.0.php" hash="bddc314f836ac89834648367a3215f8d"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Activated_Slider.xml" hash="587768b668fb39f9583b591e8747ae2e"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="activated_slider.xml" hash="dff868303051d8c8cf0cf85c88a9feca"/></dir><dir name="template"><dir name="slider"><file name="form.phtml" hash="1d9cc10eb69eb23d385fc0b921ddb7d8"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="activated_slider.xml" hash="4395e9f4841bd375a88895fea3832a0d"/></dir><dir name="template"><dir name="activated"><dir name="slider"><file name="banner.phtml" hash="a57ee3d4d1e3d10c80c77f8a9b72c447"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="css"><dir name="activated"><dir name="slider"><file name="flexslider.css" hash="6f7dc85d174d9f4e6e18198e888513bf"/><dir name="fonts"><file name="flexslider-icon.eot" hash="9c9cb7a6055043933ba68854f521af45"/><file name="flexslider-icon.svg" hash="10e8a5455c4522c48aa975eacd4f0023"/><file name="flexslider-icon.ttf" hash="b4c9e5057989b9727a5df4e0a21af33c"/><file name="flexslider-icon.woff" hash="f8b92f66539473eea649c8514eb836a0"/></dir></dir></dir></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="activated"><dir name="slider"><file name="banner.js" hash="ac0daf7f9f84a32e2f641570fccf3951"/><file name="jquery.flexslider-min.js" hash="850417bf7853c0623933a47243cb3a5a"/><file name="jquery.js" hash="9e0fc95e071e2914ddbcdfe0fcd76d70"/></dir></dir></dir></target></contents>
17
  <compatible/>
18
+ <dependencies><required><php><min>5.2.17</min><max>5.6.3</max></php></required></dependencies>
19
  </package>