Wyomind_WatchLog - Version 1.1.1

Version Notes

Download this release

Release Info

Developer Wyomind
Extension Wyomind_WatchLog
Version 1.1.1
Comparing to
See all releases


Code changes from version 1.1.0 to 1.1.1

Files changed (8) hide show
  1. app/code/community/Wyomind/Watchlog/Helper/Data.php +1 -1
  2. app/code/community/Wyomind/Watchlog/controllers/Adminhtml/AdvancedController.php +3 -1
  3. app/code/community/Wyomind/Watchlog/controllers/Adminhtml/BasicController.php +3 -1
  4. app/code/community/Wyomind/Watchlog/etc/config.xml +8 -8
  5. app/design/adminhtml/default/default/layout/watchlog.xml +4 -4
  6. app/design/adminhtml/default/default/template/watchlog/advanced.phtml +1 -1
  7. app/design/adminhtml/default/default/template/watchlog/basic.phtml +1 -1
  8. package.xml +31 -19
app/code/community/Wyomind/Watchlog/Helper/Data.php CHANGED
@@ -13,7 +13,7 @@ class Wyomind_Watchlog_Helper_Data extends Mage_Core_Helper_Abstract {
13
  // add notif in inbox
14
  $notification_title = Mage::getStoreConfig("watchlogpro/settings/notification_title");
15
  $notification_description = Mage::getStoreConfig("watchlogpro/settings/notification_description");
16
- $notification_link = Mage::helper("adminhtml")->getUrl("watchlog/adminhtml_basic/index/");
17
  $date = Mage::getSingleton('core/date')->gmtDate('Y-m-d H:i:s');
18
 
19
  $notify = Mage::getModel('adminnotification/inbox');
13
  // add notif in inbox
14
  $notification_title = Mage::getStoreConfig("watchlogpro/settings/notification_title");
15
  $notification_description = Mage::getStoreConfig("watchlogpro/settings/notification_description");
16
+ $notification_link = Mage::helper("adminhtml")->getUrl("/adminhtml/index/");
17
  $date = Mage::getSingleton('core/date')->gmtDate('Y-m-d H:i:s');
18
 
19
  $notify = Mage::getModel('adminnotification/inbox');
app/code/community/Wyomind/Watchlog/controllers/Adminhtml/AdvancedController.php CHANGED
@@ -9,7 +9,9 @@ class Wyomind_Watchlog_Adminhtml_AdvancedController extends Mage_Adminhtml_Contr
9
  $this->loadLayout()->_setActiveMenu("watchlog/watchlog")->_addBreadcrumb(Mage::helper("adminhtml")->__("Watchlog"), Mage::helper("adminhtml")->__("Watchlog"));
10
  return $this;
11
  }
12
-
 
 
13
  public function indexAction() {
14
  $this->_title($this->__("Watchlog"));
15
  $this->_title($this->__("Manager Watchlog"));
9
  $this->loadLayout()->_setActiveMenu("watchlog/watchlog")->_addBreadcrumb(Mage::helper("adminhtml")->__("Watchlog"), Mage::helper("adminhtml")->__("Watchlog"));
10
  return $this;
11
  }
12
+ protected function _isAllowed() {
13
+ return Mage::getSingleton('admin/session')->isAllowed('system/watchlog');
14
+ }
15
  public function indexAction() {
16
  $this->_title($this->__("Watchlog"));
17
  $this->_title($this->__("Manager Watchlog"));
app/code/community/Wyomind/Watchlog/controllers/Adminhtml/BasicController.php CHANGED
@@ -12,7 +12,9 @@ class Wyomind_Watchlog_Adminhtml_BasicController extends Mage_Adminhtml_Controll
12
 
13
  return $this;
14
  }
15
-
 
 
16
  public function indexAction() {
17
  $this->_title($this->__("Watchlog"));
18
  $this->_title($this->__("Manager Watchlog"));
12
 
13
  return $this;
14
  }
15
+ protected function _isAllowed() {
16
+ return Mage::getSingleton('admin/session')->isAllowed('system/watchlog');
17
+ }
18
  public function indexAction() {
19
  $this->_title($this->__("Watchlog"));
20
  $this->_title($this->__("Manager Watchlog"));
app/code/community/Wyomind/Watchlog/etc/config.xml CHANGED
@@ -2,13 +2,13 @@
2
  <config>
3
  <modules>
4
  <Wyomind_Watchlog>
5
- <version>1.1.0</version>
6
  </Wyomind_Watchlog>
7
  </modules>
8
  <default>
9
  <watchlogpro>
10
  <license>
11
- <version>1.1.0</version>
12
  </license>
13
  <settings>
14
  <history>30</history>
@@ -104,13 +104,13 @@
104
  </global>
105
  <admin>
106
  <routers>
107
- <watchlog>
108
- <use>admin</use>
109
  <args>
110
- <module>Wyomind_Watchlog</module>
111
- <frontName>watchlog</frontName>
 
112
  </args>
113
- </watchlog>
114
  </routers>
115
  </admin>
116
  <adminhtml>
@@ -120,7 +120,7 @@
120
  <watchlog module="watchlog">
121
  <title>Watchlog</title>
122
  <sort_order>1</sort_order>
123
- <action>watchlog/adminhtml_basic</action>
124
  </watchlog>
125
  </children>
126
  </system>
2
  <config>
3
  <modules>
4
  <Wyomind_Watchlog>
5
+ <version>1.1.1</version>
6
  </Wyomind_Watchlog>
7
  </modules>
8
  <default>
9
  <watchlogpro>
10
  <license>
11
+ <version>1.1.1</version>
12
  </license>
13
  <settings>
14
  <history>30</history>
104
  </global>
105
  <admin>
106
  <routers>
107
+ <adminhtml>
 
108
  <args>
109
+ <modules>
110
+ <Wyomind_Watchlog after="Mage_Adminhtml">Wyomind_Watchlog_Adminhtml</Wyomind_Watchlog>
111
+ </modules>
112
  </args>
113
+ </adminhtml>
114
  </routers>
115
  </admin>
116
  <adminhtml>
120
  <watchlog module="watchlog">
121
  <title>Watchlog</title>
122
  <sort_order>1</sort_order>
123
+ <action>adminhtml/basic</action>
124
  </watchlog>
125
  </children>
126
  </system>
app/design/adminhtml/default/default/layout/watchlog.xml CHANGED
@@ -1,14 +1,14 @@
1
  <?xml version="1.0"?>
2
  <layout version="0.1.0">
3
- <watchlog_adminhtml_basic_index>
4
  <reference name="content">
5
  <block type="watchlog/adminhtml_basic" name="basic" />
6
  </reference>
7
- </watchlog_adminhtml_basic_index>
8
 
9
- <watchlog_adminhtml_advanced_index>
10
  <reference name="content">
11
  <block type="watchlog/adminhtml_advanced" name="advanced" />
12
  </reference>
13
- </watchlog_adminhtml_advanced_index>
14
  </layout>
1
  <?xml version="1.0"?>
2
  <layout version="0.1.0">
3
+ <adminhtml_basic_index>
4
  <reference name="content">
5
  <block type="watchlog/adminhtml_basic" name="basic" />
6
  </reference>
7
+ </adminhtml_basic_index>
8
 
9
+ <adminhtml_advanced_index>
10
  <reference name="content">
11
  <block type="watchlog/adminhtml_advanced" name="advanced" />
12
  </reference>
13
+ </adminhtml_advanced_index>
14
  </layout>
app/design/adminhtml/default/default/template/watchlog/advanced.phtml CHANGED
@@ -21,7 +21,7 @@ echo $this->getLayout()->createBlock('watchlog/adminhtml_chart')->toHtml();
21
  </tr>
22
  </tbody></table>
23
 
24
- <button style="float:right" onclick="document.location = '<?php echo $this->getUrl("watchlog/adminhtml_basic/"); ?>'" class="scalable " type="button" id="id_ac70c58d4253e1185f2c709235b0c991"><span><span><span><?php echo $this->__("Switch to the detailled view"); ?></span></span></span></button>
25
 
26
  </div>
27
 
21
  </tr>
22
  </tbody></table>
23
 
24
+ <button style="float:right" onclick="document.location = '<?php echo $this->getUrl("adminhtml/basic/"); ?>'" class="scalable " type="button" id="id_ac70c58d4253e1185f2c709235b0c991"><span><span><span><?php echo $this->__("Switch to the detailled view"); ?></span></span></span></button>
25
 
26
  </div>
27
 
app/design/adminhtml/default/default/template/watchlog/basic.phtml CHANGED
@@ -20,7 +20,7 @@ echo $this->getLayout()->createBlock('watchlog/adminhtml_chart')->toHtml();
20
  </tbody>
21
  </table>
22
 
23
- <button style="float:right" onclick="document.location = '<?php echo $this->getUrl("watchlog/adminhtml_advanced/"); ?>'" class="scalable " type="button" id="id_ac70c58d4253e1185f2c709235b0c991"><span><span><span><?php echo $this->__("Switch to the summarized view"); ?></span></span></span></button>
24
 
25
  </div>
26
 
20
  </tbody>
21
  </table>
22
 
23
+ <button style="float:right" onclick="document.location = '<?php echo $this->getUrl("adminhtml/advanced/"); ?>'" class="scalable " type="button" id="id_ac70c58d4253e1185f2c709235b0c991"><span><span><span><?php echo $this->__("Switch to the summarized view"); ?></span></span></span></button>
24
 
25
  </div>
26
 
package.xml CHANGED
@@ -1,14 +1,14 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Wyomind_WatchLog</name>
4
- <version>1.1.0</version>
5
  <stability>stable</stability>
6
  <license>Commercial</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Wyomind Watchlog extension</summary>
10
  <description>Wyomind Watchlog extension</description>
11
- <notes>test</notes>
12
  <authors>
13
  <author>
14
  <name>Wyomind</name>
@@ -16,8 +16,8 @@
16
  <email>contact@wyomind.com</email>
17
  </author>
18
  </authors>
19
- <date>2015-05-21</date>
20
- <time>14:39:18</time>
21
  <contents>
22
  <target name="magecommunity">
23
  <dir name="Wyomind">
@@ -48,8 +48,18 @@
48
  </dir>
49
  </dir>
50
  </dir>
 
 
 
 
 
 
 
 
 
 
51
  <dir name="Helper">
52
- <file name="Data.php" hash="e287e9c1da2a49f76d409a51738dd947"/>
53
  </dir>
54
  <dir name="Model">
55
  <dir name="Mysql4">
@@ -68,16 +78,6 @@
68
  </dir>
69
  <file name="Watchlog.php" hash="6b8c24a306f22dbd6ff79a21f88e17c6"/>
70
  </dir>
71
- <dir name="controllers">
72
- <dir name="Adminhtml">
73
- <file name="AdvancedController.php" hash="738d4938627b38dc5c744d1d33e913ea"/>
74
- <file name="BasicController.php" hash="a8a0d4c9b9f012a825074caf49bf463e"/>
75
- </dir>
76
- </dir>
77
- <dir name="etc">
78
- <file name="config.xml" hash="b71d538e0fe1d8c059d7f8a6aea91409"/>
79
- <file name="system.xml" hash="401cd5b8c13f9c092f2838172da714ff"/>
80
- </dir>
81
  <dir name="sql">
82
  <dir name="watchlog_setup">
83
  <file name="mysql4-install-1.0.0.php" hash="e684d06971d0258c94cf92f094dea1cd"/>
@@ -91,12 +91,12 @@
91
  <dir name="default">
92
  <dir name="default">
93
  <dir name="layout">
94
- <file name="watchlog.xml" hash="5128504499f65e82c7fad74ab0783394"/>
95
  </dir>
96
  <dir name="template">
97
  <dir name="watchlog">
98
- <file name="advanced.phtml" hash="87761a8bb08926299cbb2abae2b7f25d"/>
99
- <file name="basic.phtml" hash="5f31f62449b9dc014975f4b9c33b1fd7"/>
100
  <file name="chart.phtml" hash="7308920f035447e2ed2ec4787f5fd311"/>
101
  <dir name="email">
102
  <file name="report.phtml" hash="8fbbc89b71371cbd73478582c9c41be8"/>
@@ -107,7 +107,19 @@
107
  </dir>
108
  </dir>
109
  </target>
110
- <target name="mageetc">@FILES3@
 
 
 
 
 
 
 
 
 
 
 
 
111
  </target>
112
  </contents>
113
  <compatible/>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Wyomind_WatchLog</name>
4
+ <version>1.1.1</version>
5
  <stability>stable</stability>
6
  <license>Commercial</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Wyomind Watchlog extension</summary>
10
  <description>Wyomind Watchlog extension</description>
11
+ <notes></notes>
12
  <authors>
13
  <author>
14
  <name>Wyomind</name>
16
  <email>contact@wyomind.com</email>
17
  </author>
18
  </authors>
19
+ <date>2015-10-27</date>
20
+ <time>14:23:13</time>
21
  <contents>
22
  <target name="magecommunity">
23
  <dir name="Wyomind">
48
  </dir>
49
  </dir>
50
  </dir>
51
+ <dir name="controllers">
52
+ <dir name="Adminhtml">
53
+ <file name="AdvancedController.php" hash="5b7041f326bdf4ee7e07e54c7b306b49"/>
54
+ <file name="BasicController.php" hash="04f291bdf8d17c71f3fc64ab4bc1098f"/>
55
+ </dir>
56
+ </dir>
57
+ <dir name="etc">
58
+ <file name="config.xml" hash="6ed061657695268a46dcd7bbeb531343"/>
59
+ <file name="system.xml" hash="401cd5b8c13f9c092f2838172da714ff"/>
60
+ </dir>
61
  <dir name="Helper">
62
+ <file name="Data.php" hash="d4263d64036d13367f83388fb0f36f23"/>
63
  </dir>
64
  <dir name="Model">
65
  <dir name="Mysql4">
78
  </dir>
79
  <file name="Watchlog.php" hash="6b8c24a306f22dbd6ff79a21f88e17c6"/>
80
  </dir>
 
 
 
 
 
 
 
 
 
 
81
  <dir name="sql">
82
  <dir name="watchlog_setup">
83
  <file name="mysql4-install-1.0.0.php" hash="e684d06971d0258c94cf92f094dea1cd"/>
91
  <dir name="default">
92
  <dir name="default">
93
  <dir name="layout">
94
+ <file name="watchlog.xml" hash="6029babfae852dc848721fb46643e936"/>
95
  </dir>
96
  <dir name="template">
97
  <dir name="watchlog">
98
+ <file name="advanced.phtml" hash="798be1eaa8769d293efde4d5c38be936"/>
99
+ <file name="basic.phtml" hash="9d1f48e90cf7d7755c8a1e64a09a7be0"/>
100
  <file name="chart.phtml" hash="7308920f035447e2ed2ec4787f5fd311"/>
101
  <dir name="email">
102
  <file name="report.phtml" hash="8fbbc89b71371cbd73478582c9c41be8"/>
107
  </dir>
108
  </dir>
109
  </target>
110
+ <target name="mageetc">
111
+ <dir name="modules">
112
+ <file name="Wyomind_Watchlog.xml" hash="7555645803666036cdd714ac9e5c1e15"/>
113
+ </dir>
114
+ </target>
115
+ <target name="magelocale">
116
+ <dir name="en_US">
117
+ <dir name="template">
118
+ <dir name="email">
119
+ <file name="watchlog_report.html" hash="8a374b934d846dd62edb632bb39187c8"/>
120
+ </dir>
121
+ </dir>
122
+ </dir>
123
  </target>
124
  </contents>
125
  <compatible/>