Version Notes
Did we add new features?
Yes
Did you fix a bunch of Bugs?
Yes
Well then, what in funkytown did you do?
Fixed a character limitation bug with imports
Added Magento Notifications to make clients aware of available updates and bug fixes on Magento Connect.
Updated Licensing.
Fixed an export bug that produced translated export headers and thus prevented some none-english stores from importing their csv's .
Download this release
Release Info
Developer | Gareth Price |
Extension | Clearandfizzy_EnhancedCMS |
Version | 1.2.2 |
Comparing to | |
See all releases |
Code changes from version 1.2.0 to 1.2.2
- app/code/community/Clearandfizzy/EnhancedCMS/Block/Adminhtml/Cms/Enhanced/Page/Grid.php +29 -26
- app/code/community/Clearandfizzy/EnhancedCMS/Model/Import/Abstract/Csv.php +21 -1
- app/code/community/Clearandfizzy/EnhancedCMS/Model/Observer/.DS_Store +0 -0
- app/code/community/Clearandfizzy/EnhancedCMS/etc/system.xml +12 -5
- package.xml +6 -5
app/code/community/Clearandfizzy/EnhancedCMS/Block/Adminhtml/Cms/Enhanced/Page/Grid.php
CHANGED
@@ -18,136 +18,139 @@ class Clearandfizzy_EnhancedCMS_Block_Adminhtml_Cms_Enhanced_Page_Grid
|
|
18 |
$this->setId('staticBlocksGrid');
|
19 |
$this->setDefaultSort('block_id');
|
20 |
$this->setDefaultDir('desc');
|
21 |
-
}
|
22 |
|
|
|
|
|
|
|
|
|
23 |
protected function _prepareColumns()
|
24 |
{
|
25 |
$this->addColumn('page_id', array(
|
26 |
-
'header' =>
|
27 |
'width' =>'50px',
|
28 |
'index' => 'page_id'
|
29 |
));
|
30 |
|
31 |
$this->addColumn('title', array(
|
32 |
-
'header' =>
|
33 |
'width' =>'50px',
|
34 |
'index' => 'title'
|
35 |
));
|
36 |
|
37 |
$this->addColumn('root_template', array(
|
38 |
-
'header' =>
|
39 |
'width' =>'50px',
|
40 |
'index' => 'root_template'
|
41 |
));
|
42 |
|
43 |
$this->addColumn('meta_keywords', array(
|
44 |
-
'header' =>
|
45 |
'width' =>'50px',
|
46 |
'index' => 'meta_keywords'
|
47 |
));
|
48 |
|
49 |
$this->addColumn('meta_description', array(
|
50 |
-
'header' =>
|
51 |
'width' =>'50px',
|
52 |
'index' => 'meta_description'
|
53 |
));
|
54 |
|
55 |
$this->addColumn('identifier', array(
|
56 |
-
'header' =>
|
57 |
'width' =>'50px',
|
58 |
'index' => 'identifier'
|
59 |
));
|
60 |
|
61 |
$this->addColumn('content_heading', array(
|
62 |
-
'header' =>
|
63 |
'width' =>'50px',
|
64 |
'index' => 'content_heading',
|
65 |
'frame_callback' => array($this, 'entityDecode')
|
66 |
));
|
67 |
|
68 |
$this->addColumn('content', array(
|
69 |
-
'header' =>
|
70 |
'width' =>'50px',
|
71 |
'index' => 'content',
|
72 |
'frame_callback' => array($this, 'entityDecode')
|
73 |
));
|
74 |
|
75 |
$this->addColumn('creation_time', array(
|
76 |
-
'header' =>
|
77 |
'width' =>'50px',
|
78 |
'index' => 'creation_time'
|
79 |
));
|
80 |
|
81 |
$this->addColumn('update_time', array(
|
82 |
-
'header' =>
|
83 |
'width' =>'50px',
|
84 |
'index' => 'update_time'
|
85 |
));
|
86 |
|
87 |
$this->addColumn('is_active', array(
|
88 |
-
'header' =>
|
89 |
'width' =>'50px',
|
90 |
'index' => 'is_active'
|
91 |
));
|
92 |
|
93 |
$this->addColumn('sort_order', array(
|
94 |
-
'header' =>
|
95 |
'width' =>'50px',
|
96 |
'index' => 'sort_order'
|
97 |
));
|
98 |
|
99 |
-
|
100 |
$this->addColumn('layout_update_xml', array(
|
101 |
-
'header' =>
|
102 |
'width' =>'50px',
|
103 |
'index' => 'layout_update_xml',
|
104 |
'frame_callback' => array($this, 'entityDecode')
|
105 |
|
106 |
));
|
107 |
|
108 |
-
|
109 |
$this->addColumn('custom_theme', array(
|
110 |
-
'header' =>
|
111 |
'width' =>'50px',
|
112 |
'index' => 'custom_theme'
|
113 |
));
|
114 |
|
115 |
$this->addColumn('custom_root_template', array(
|
116 |
-
'header' =>
|
117 |
'width' =>'50px',
|
118 |
'index' => 'custom_root_template'
|
119 |
));
|
120 |
|
121 |
$this->addColumn('custom_layout_update_xml', array(
|
122 |
-
'header' =>
|
123 |
'width' =>'50px',
|
124 |
'index' => 'custom_layout_update_xml'
|
125 |
));
|
126 |
|
127 |
$this->addColumn('custom_theme_from', array(
|
128 |
-
'header' =>
|
129 |
'width' =>'50px',
|
130 |
'index' => 'custom_theme_from'
|
131 |
));
|
132 |
|
133 |
$this->addColumn('custom_theme_to', array(
|
134 |
-
'header' =>
|
135 |
'width' =>'50px',
|
136 |
'index' => 'custom_theme_to'
|
137 |
));
|
138 |
|
139 |
$this->addColumn('stores', array(
|
140 |
-
'header' =>
|
141 |
'index' => 'stores',
|
142 |
));
|
143 |
|
144 |
$this->addExportType('*/*/exportCsv', Mage::helper('clearandfizzy_enhancedcms')->__('CSV'));
|
145 |
|
146 |
return parent::_prepareColumns();
|
|
|
147 |
|
148 |
-
|
149 |
-
|
150 |
-
|
151 |
protected function _prepareCollection()
|
152 |
{
|
153 |
//$block_collection = Mage::getModel('cms/block')->getCollection();
|
@@ -164,7 +167,7 @@ class Clearandfizzy_EnhancedCMS_Block_Adminhtml_Cms_Enhanced_Page_Grid
|
|
164 |
$this->setCollection($collection);
|
165 |
|
166 |
return parent::_prepareCollection();
|
167 |
-
}
|
168 |
|
169 |
|
170 |
}
|
18 |
$this->setId('staticBlocksGrid');
|
19 |
$this->setDefaultSort('block_id');
|
20 |
$this->setDefaultDir('desc');
|
21 |
+
} // end fun
|
22 |
|
23 |
+
/**
|
24 |
+
* Columns use to output the CSV File
|
25 |
+
*
|
26 |
+
*/
|
27 |
protected function _prepareColumns()
|
28 |
{
|
29 |
$this->addColumn('page_id', array(
|
30 |
+
'header' =>'page_id',
|
31 |
'width' =>'50px',
|
32 |
'index' => 'page_id'
|
33 |
));
|
34 |
|
35 |
$this->addColumn('title', array(
|
36 |
+
'header' =>'title',
|
37 |
'width' =>'50px',
|
38 |
'index' => 'title'
|
39 |
));
|
40 |
|
41 |
$this->addColumn('root_template', array(
|
42 |
+
'header' =>'root_template',
|
43 |
'width' =>'50px',
|
44 |
'index' => 'root_template'
|
45 |
));
|
46 |
|
47 |
$this->addColumn('meta_keywords', array(
|
48 |
+
'header' =>'meta_keywords',
|
49 |
'width' =>'50px',
|
50 |
'index' => 'meta_keywords'
|
51 |
));
|
52 |
|
53 |
$this->addColumn('meta_description', array(
|
54 |
+
'header' =>'meta_description',
|
55 |
'width' =>'50px',
|
56 |
'index' => 'meta_description'
|
57 |
));
|
58 |
|
59 |
$this->addColumn('identifier', array(
|
60 |
+
'header' =>'identifier',
|
61 |
'width' =>'50px',
|
62 |
'index' => 'identifier'
|
63 |
));
|
64 |
|
65 |
$this->addColumn('content_heading', array(
|
66 |
+
'header' =>'content_heading',
|
67 |
'width' =>'50px',
|
68 |
'index' => 'content_heading',
|
69 |
'frame_callback' => array($this, 'entityDecode')
|
70 |
));
|
71 |
|
72 |
$this->addColumn('content', array(
|
73 |
+
'header' =>'content',
|
74 |
'width' =>'50px',
|
75 |
'index' => 'content',
|
76 |
'frame_callback' => array($this, 'entityDecode')
|
77 |
));
|
78 |
|
79 |
$this->addColumn('creation_time', array(
|
80 |
+
'header' =>'creation_time',
|
81 |
'width' =>'50px',
|
82 |
'index' => 'creation_time'
|
83 |
));
|
84 |
|
85 |
$this->addColumn('update_time', array(
|
86 |
+
'header' =>'update_time',
|
87 |
'width' =>'50px',
|
88 |
'index' => 'update_time'
|
89 |
));
|
90 |
|
91 |
$this->addColumn('is_active', array(
|
92 |
+
'header' =>'is_active',
|
93 |
'width' =>'50px',
|
94 |
'index' => 'is_active'
|
95 |
));
|
96 |
|
97 |
$this->addColumn('sort_order', array(
|
98 |
+
'header' =>'sort_order',
|
99 |
'width' =>'50px',
|
100 |
'index' => 'sort_order'
|
101 |
));
|
102 |
|
|
|
103 |
$this->addColumn('layout_update_xml', array(
|
104 |
+
'header' =>'layout_update_xml',
|
105 |
'width' =>'50px',
|
106 |
'index' => 'layout_update_xml',
|
107 |
'frame_callback' => array($this, 'entityDecode')
|
108 |
|
109 |
));
|
110 |
|
|
|
111 |
$this->addColumn('custom_theme', array(
|
112 |
+
'header' =>'custom_theme',
|
113 |
'width' =>'50px',
|
114 |
'index' => 'custom_theme'
|
115 |
));
|
116 |
|
117 |
$this->addColumn('custom_root_template', array(
|
118 |
+
'header' =>'custom_root_template',
|
119 |
'width' =>'50px',
|
120 |
'index' => 'custom_root_template'
|
121 |
));
|
122 |
|
123 |
$this->addColumn('custom_layout_update_xml', array(
|
124 |
+
'header' =>'custom_layout_update_xml',
|
125 |
'width' =>'50px',
|
126 |
'index' => 'custom_layout_update_xml'
|
127 |
));
|
128 |
|
129 |
$this->addColumn('custom_theme_from', array(
|
130 |
+
'header' =>'custom_theme_from',
|
131 |
'width' =>'50px',
|
132 |
'index' => 'custom_theme_from'
|
133 |
));
|
134 |
|
135 |
$this->addColumn('custom_theme_to', array(
|
136 |
+
'header' =>'custom_theme_to',
|
137 |
'width' =>'50px',
|
138 |
'index' => 'custom_theme_to'
|
139 |
));
|
140 |
|
141 |
$this->addColumn('stores', array(
|
142 |
+
'header' => 'stores',
|
143 |
'index' => 'stores',
|
144 |
));
|
145 |
|
146 |
$this->addExportType('*/*/exportCsv', Mage::helper('clearandfizzy_enhancedcms')->__('CSV'));
|
147 |
|
148 |
return parent::_prepareColumns();
|
149 |
+
} // end fun
|
150 |
|
151 |
+
/**
|
152 |
+
*
|
153 |
+
*/
|
154 |
protected function _prepareCollection()
|
155 |
{
|
156 |
//$block_collection = Mage::getModel('cms/block')->getCollection();
|
167 |
$this->setCollection($collection);
|
168 |
|
169 |
return parent::_prepareCollection();
|
170 |
+
} // end fun
|
171 |
|
172 |
|
173 |
}
|
app/code/community/Clearandfizzy/EnhancedCMS/Model/Import/Abstract/Csv.php
CHANGED
@@ -109,17 +109,37 @@ class Clearandfizzy_EnhancedCMS_Model_Import_Abstract_Csv extends Mage_Core_Mode
|
|
109 |
$staticblock->save();
|
110 |
Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('cms')->__('Updated ' . $identifier));
|
111 |
} catch (Exception $e) {
|
112 |
-
Mage::throwException($e->getMessage() . '
|
|
|
113 |
}
|
114 |
} // end while
|
115 |
}// end if
|
116 |
|
117 |
} // end
|
118 |
|
|
|
|
|
|
|
|
|
119 |
private function mapHeader($data_array) {
|
120 |
$this->header_columns = $data_array;
|
121 |
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
122 |
|
|
|
|
|
|
|
|
|
123 |
private function getIdentifierColumnIndex() {
|
124 |
$header = $this->header_columns;
|
125 |
$index = array_search('Identifier', $header);
|
109 |
$staticblock->save();
|
110 |
Mage::getSingleton('adminhtml/session')->addSuccess(Mage::helper('cms')->__('Updated ' . $identifier));
|
111 |
} catch (Exception $e) {
|
112 |
+
Mage::throwException($e->getMessage() . 'ID = ' . $data[$this->getIdentifierColumnIndex()]
|
113 |
+
);
|
114 |
}
|
115 |
} // end while
|
116 |
}// end if
|
117 |
|
118 |
} // end
|
119 |
|
120 |
+
/**
|
121 |
+
*
|
122 |
+
* @param unknown $data_array
|
123 |
+
*/
|
124 |
private function mapHeader($data_array) {
|
125 |
$this->header_columns = $data_array;
|
126 |
}
|
127 |
+
|
128 |
+
/**
|
129 |
+
*
|
130 |
+
* @param unknown $name
|
131 |
+
* @return mixed
|
132 |
+
*/
|
133 |
+
private function getIndexByName($name) {
|
134 |
+
$header = $this->header_columns;
|
135 |
+
$index = array_search($name, $header);
|
136 |
+
return $index;
|
137 |
+
}
|
138 |
|
139 |
+
/**
|
140 |
+
*
|
141 |
+
* @return mixed
|
142 |
+
*/
|
143 |
private function getIdentifierColumnIndex() {
|
144 |
$header = $this->header_columns;
|
145 |
$index = array_search('Identifier', $header);
|
app/code/community/Clearandfizzy/EnhancedCMS/Model/Observer/.DS_Store
DELETED
Binary file
|
app/code/community/Clearandfizzy/EnhancedCMS/etc/system.xml
CHANGED
@@ -62,13 +62,20 @@
|
|
62 |
<show_in_default>1</show_in_default>
|
63 |
<show_in_website>1</show_in_website>
|
64 |
<show_in_store>1</show_in_store>
|
65 |
-
|
66 |
-
|
67 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
68 |
<expanded>1</expanded>
|
69 |
</enhancedcms_about>
|
70 |
-
|
71 |
-
</groups>
|
|
|
72 |
</clearandfizzy_enhancedcms_settings>
|
73 |
</sections>
|
74 |
|
62 |
<show_in_default>1</show_in_default>
|
63 |
<show_in_website>1</show_in_website>
|
64 |
<show_in_store>1</show_in_store>
|
65 |
+
<comment><![CDATA[<ol>
|
66 |
+
<li><h3>About</h3></li>
|
67 |
+
<li>Adds export & import buttons to Magento's CMS Pages and CMS blocks in .CSV format.</li>
|
68 |
+
<li>Migrate Magento CMS Pages / Blocks between server environments via CSV.</li>
|
69 |
+
<li> </li>
|
70 |
+
<li><h3>Support</h3></li>
|
71 |
+
<li>The Magento Connect extension page can be found here <a target="_blank" style="color: blue;" href="http://www.magentocommerce.com/magento-connect/enhanced-cms-pages-static-block-importer.html">http://www.magentocommerce.com/magento-connect/enhanced-cms-pages-static-block-importer.html</a></li>
|
72 |
+
<li>More Extensions: <a target="_blank" style="color: blue;" href="http://www.magentocommerce.com/magento-connect/developer/Gareth+Price#developer-view:extensions">http://www.magentocommerce.com/magento-connect/developer/Gareth+Price#developer-view:extensions</a>
|
73 |
+
</ol>]]></comment>
|
74 |
<expanded>1</expanded>
|
75 |
</enhancedcms_about>
|
76 |
+
|
77 |
+
</groups>
|
78 |
+
|
79 |
</clearandfizzy_enhancedcms_settings>
|
80 |
</sections>
|
81 |
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Clearandfizzy_EnhancedCMS</name>
|
4 |
-
<version>1.2.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.clearandfizzy.com/licence.txt">Clearandfizzy Licence</license>
|
7 |
<channel>community</channel>
|
@@ -20,11 +20,12 @@ Yes
|
|
20 |
Well then, what in funkytown did you do?<br />
|
21 |
Fixed a character limitation bug with imports<br />
|
22 |
Added Magento Notifications to make clients aware of available updates and bug fixes on Magento Connect.<br />
|
23 |
-
Updated Licensing.<br />
|
|
|
24 |
<authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
|
25 |
-
<date>2015-
|
26 |
-
<time>
|
27 |
-
<contents><target name="magecommunity"><dir name="Clearandfizzy"><dir name="EnhancedCMS"><file name="ABOUT.html" hash="83d1c44a546591edfebb581e9b4577b0"/><dir name="Block"><dir name="Adminhtml"><dir name="Cms"><dir name="Block"><file name="Grid.php" hash="3b820b50674e46e86258de214f72cf7c"/></dir><file name="Block.php" hash="5380ee5161e671c23589c45572672ce2"/><dir name="Enhanced"><dir name="Abstract"><file name="Grid.php" hash="8645e6d14b7d8472a8d50625421e32c8"/><dir name="Upload"><file name="Form.php" hash="8a935e404b379caa78bf57a5c3c23861"/></dir><file name="Upload.php" hash="c2e43f1cbafe3024820ace1c091b1139"/></dir><dir name="Block"><file name="Grid.php" hash="d8d9fc748adbbee31e23159cd7dfb152"/><dir name="Upload"><file name="Form.php" hash="b8d39eda7376ed1837eef7f5b948d4f4"/></dir><file name="Upload.php" hash="2d902b062637096e62a2883f600886ac"/></dir><dir name="Page"><file name="Grid.php" hash="
|
28 |
<compatible/>
|
29 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
30 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Clearandfizzy_EnhancedCMS</name>
|
4 |
+
<version>1.2.2</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.clearandfizzy.com/licence.txt">Clearandfizzy Licence</license>
|
7 |
<channel>community</channel>
|
20 |
Well then, what in funkytown did you do?<br />
|
21 |
Fixed a character limitation bug with imports<br />
|
22 |
Added Magento Notifications to make clients aware of available updates and bug fixes on Magento Connect.<br />
|
23 |
+
Updated Licensing.<br />
|
24 |
+
Fixed an export bug that produced translated export headers and thus prevented some none-english stores from importing their csv's .<br /></notes>
|
25 |
<authors><author><name>Gareth Price</name><user>clearandfizzy</user><email>gareth@clearandfizzy.com</email></author></authors>
|
26 |
+
<date>2015-08-01</date>
|
27 |
+
<time>16:11:11</time>
|
28 |
+
<contents><target name="magecommunity"><dir name="Clearandfizzy"><dir name="EnhancedCMS"><file name="ABOUT.html" hash="83d1c44a546591edfebb581e9b4577b0"/><dir name="Block"><dir name="Adminhtml"><dir name="Cms"><dir name="Block"><file name="Grid.php" hash="3b820b50674e46e86258de214f72cf7c"/></dir><file name="Block.php" hash="5380ee5161e671c23589c45572672ce2"/><dir name="Enhanced"><dir name="Abstract"><file name="Grid.php" hash="8645e6d14b7d8472a8d50625421e32c8"/><dir name="Upload"><file name="Form.php" hash="8a935e404b379caa78bf57a5c3c23861"/></dir><file name="Upload.php" hash="c2e43f1cbafe3024820ace1c091b1139"/></dir><dir name="Block"><file name="Grid.php" hash="d8d9fc748adbbee31e23159cd7dfb152"/><dir name="Upload"><file name="Form.php" hash="b8d39eda7376ed1837eef7f5b948d4f4"/></dir><file name="Upload.php" hash="2d902b062637096e62a2883f600886ac"/></dir><dir name="Page"><file name="Grid.php" hash="ce85972f344957737f922a601ab0f744"/><dir name="Upload"><file name="Form.php" hash="67fce65dfd803e1eb441da821c440e1e"/></dir><file name="Upload.php" hash="a58ead925c28ba1fda72f5948a9f9e07"/></dir></dir><dir name="Page"><file name="Grid.php" hash="c1aacafd43e4cd4df726faefb94db213"/></dir><file name="Page.php" hash="7a0487082db181ebf882ec9426f71b85"/></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="9af1afd5381b824c191bf8ca1e9fff49"/></dir><dir name="Model"><dir name="Import"><dir name="Abstract"><file name="Csv.php" hash="537c1a42507ac1b1f5c40a0a58454691"/></dir><dir name="Block"><file name="Csv.php" hash="a6f113c46fd89a40b164151f79a6fe21"/></dir><file name="Block.php" hash="7862d4d7f4d95cc50635061a75ad7a3d"/><dir name="Page"><file name="Csv.php" hash="1e339345efb3ff4add3f83fa0129e008"/></dir><file name="Page.php" hash="8c5274c12a06c30b067b8ba23aca83ad"/></dir><dir name="Notification"><file name="Feed.php" hash="cc00809b1c332f0211200532828aa8d1"/></dir><dir name="Observer"><dir name="Notification"><file name="Feed.php" hash="e94a932c76f0b7a40f68a6e9fdff36dc"/></dir></dir></dir><file name="README.txt" hash="b6915808b7af4e89fef5d81259598862"/><dir name="controllers"><dir name="Adminhtml"><dir name="Cms"><dir name="Enhanced"><file name="BlockController.php" hash="87d821c9b568096c3cff1724905bb8ae"/><file name="PageController.php" hash="ceb9f4dba37eb01fd1d735b93f483468"/></dir></dir></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="a731388a0058d0b335fbe7b04659fccb"/><file name="config.xml" hash="f15cf79eed16a3518a29a29c276836fa"/><file name="system.xml" hash="4f38130c08efceb74e8e777db1aa2e15"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Clearandfizzy_EnhancedCMS.xml" hash="2f484679b7deba8d32509a76862b703c"/></dir></target></contents>
|
29 |
<compatible/>
|
30 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
31 |
</package>
|