Wyomind_WatchLog - Version 1.0.1

Version Notes

test

Download this release

Release Info

Developer Wyomind
Extension Wyomind_WatchLog
Version 1.0.1
Comparing to
See all releases


Code changes from version 1.0.0 to 1.0.1

Files changed (6) hide show
  1. app/code/community/Wyomind/Watchlog/Block/Adminhtml/Advanced/Grid.php +3 -0
  2. app/code/community/Wyomind/Watchlog/Block/Adminhtml/Chart.php +1 -1
  3. app/code/community/Wyomind/Watchlog/Model/Mysql4/Watchlog/Collection.php +10 -7
  4. app/code/community/Wyomind/Watchlog/etc/config.xml +2 -2
  5. app/etc/modules/Wyomind_Watchlog.xml +1 -1
  6. package.xml +8 -8
app/code/community/Wyomind/Watchlog/Block/Adminhtml/Advanced/Grid.php CHANGED
@@ -66,6 +66,9 @@ class Wyomind_Watchlog_Block_Adminhtml_Advanced_Grid extends Mage_Adminhtml_Bloc
66
 
67
  return parent::_prepareColumns();
68
  }
 
 
 
69
 
70
 
71
  }
66
 
67
  return parent::_prepareColumns();
68
  }
69
+ public function getRowUrl($row) {
70
+ return '#';
71
+ }
72
 
73
 
74
  }
app/code/community/Wyomind/Watchlog/Block/Adminhtml/Chart.php CHANGED
@@ -44,7 +44,7 @@ class Wyomind_Watchlog_Block_Adminhtml_Chart extends Mage_Adminhtml_Block_Widget
44
  }
45
  $tmp_data[$key][$entry->getType()] = $entry->getNb();
46
  }
47
-
48
  foreach ($tmp_data as $date => $entry) {
49
  if ($pro)
50
  $data[] = array("#new Date('" . $date . "')#", (int) $entry[self::SUCCESS], (int) $entry[self::FAIL], (int) $entry[self::BLOCKED]);
44
  }
45
  $tmp_data[$key][$entry->getType()] = $entry->getNb();
46
  }
47
+ ksort($tmp_data);
48
  foreach ($tmp_data as $date => $entry) {
49
  if ($pro)
50
  $data[] = array("#new Date('" . $date . "')#", (int) $entry[self::SUCCESS], (int) $entry[self::FAIL], (int) $entry[self::BLOCKED]);
app/code/community/Wyomind/Watchlog/Model/Mysql4/Watchlog/Collection.php CHANGED
@@ -1,12 +1,15 @@
1
  <?php
2
- class Wyomind_Watchlog_Model_Mysql4_Watchlog_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract
3
- {
4
 
5
- public function _construct(){
6
- $this->_init("watchlog/watchlog");
7
- }
8
 
9
-
 
 
10
 
 
 
 
 
11
  }
12
-
 
1
  <?php
 
 
2
 
3
+ class Wyomind_Watchlog_Model_Mysql4_Watchlog_Collection extends Mage_Core_Model_Mysql4_Collection_Abstract {
 
 
4
 
5
+ public function _construct() {
6
+ $this->_init("watchlog/watchlog");
7
+ }
8
 
9
+ public function getSelectCountSql() {
10
+ $countSelect = parent::getSelectCountSql();
11
+ $countSelect->reset(Zend_Db_Select::GROUP);
12
+ return $countSelect;
13
  }
14
+
15
+ }
app/code/community/Wyomind/Watchlog/etc/config.xml CHANGED
@@ -2,13 +2,13 @@
2
  <config>
3
  <modules>
4
  <Wyomind_Watchlog>
5
- <version>1.0.0</version>
6
  </Wyomind_Watchlog>
7
  </modules>
8
  <default>
9
  <watchlogpro>
10
  <license>
11
- <version>1.0.0</version>
12
  </license>
13
  <settings>
14
  <history>30</history>
2
  <config>
3
  <modules>
4
  <Wyomind_Watchlog>
5
+ <version>1.0.1</version>
6
  </Wyomind_Watchlog>
7
  </modules>
8
  <default>
9
  <watchlogpro>
10
  <license>
11
+ <version>1.0.1</version>
12
  </license>
13
  <settings>
14
  <history>30</history>
app/etc/modules/Wyomind_Watchlog.xml CHANGED
@@ -4,7 +4,7 @@
4
  <Wyomind_Watchlog>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
- <version>1.0.0</version>
8
  </Wyomind_Watchlog>
9
  </modules>
10
  </config>
4
  <Wyomind_Watchlog>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <version>1.0.1</version>
8
  </Wyomind_Watchlog>
9
  </modules>
10
  </config>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Wyomind_WatchLog</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license>Commercial</license>
7
  <channel>community</channel>
@@ -16,8 +16,8 @@
16
  <email>contact@wyomind.com</email>
17
  </author>
18
  </authors>
19
- <date>2015-04-06</date>
20
- <time>11:20:32</time>
21
  <contents>
22
  <target name="magecommunity">
23
  <dir name="Wyomind">
@@ -25,14 +25,14 @@
25
  <dir name="Block">
26
  <dir name="Adminhtml">
27
  <dir name="Advanced">
28
- <file name="Grid.php" hash="ec2be21058bb8bffb2d859fe47d83038"/>
29
  </dir>
30
  <file name="Advanced.php" hash="e5e5a813508b0b72a2061297a936ce81"/>
31
  <dir name="Basic">
32
  <file name="Grid.php" hash="b6a78230ba28fbcee4d307ad38e840a9"/>
33
  </dir>
34
  <file name="Basic.php" hash="03f04c46cdb5077733cc417c0d10bd72"/>
35
- <file name="Chart.php" hash="37d73fc3aff1a5f8c1fe42f96ce31a8b"/>
36
  <dir name="Renderer">
37
  <file name="Ip.php" hash="5bd831a03c1c6400e4fdaf870c68fc31"/>
38
  <file name="Status.php" hash="bf96de45d6a88ae4b2d4ac3517923ad5"/>
@@ -55,7 +55,7 @@
55
  </dir>
56
  </dir>
57
  <dir name="etc">
58
- <file name="config.xml" hash="3fc965b8995cfa6c892ae1951ca7dc2b"/>
59
  <file name="system.xml" hash="401cd5b8c13f9c092f2838172da714ff"/>
60
  </dir>
61
  <dir name="Helper">
@@ -64,7 +64,7 @@
64
  <dir name="Model">
65
  <dir name="Mysql4">
66
  <dir name="Watchlog">
67
- <file name="Collection.php" hash="9d50aa0ce6b7ea5c472832c89f822276"/>
68
  </dir>
69
  <file name="Watchlog.php" hash="091d0b82dabc51de01108b29ac6f1f2b"/>
70
  </dir>
@@ -109,7 +109,7 @@
109
  </target>
110
  <target name="mageetc">
111
  <dir name="modules">
112
- <file name="Wyomind_Watchlog.xml" hash="45876d11d4021326439587a7a5fc3f86"/>
113
  </dir>
114
  </target>
115
  </contents>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Wyomind_WatchLog</name>
4
+ <version>1.0.1</version>
5
  <stability>stable</stability>
6
  <license>Commercial</license>
7
  <channel>community</channel>
16
  <email>contact@wyomind.com</email>
17
  </author>
18
  </authors>
19
+ <date>2015-04-17</date>
20
+ <time>16:15:17</time>
21
  <contents>
22
  <target name="magecommunity">
23
  <dir name="Wyomind">
25
  <dir name="Block">
26
  <dir name="Adminhtml">
27
  <dir name="Advanced">
28
+ <file name="Grid.php" hash="421c91ce39065850711a22fd314ce691"/>
29
  </dir>
30
  <file name="Advanced.php" hash="e5e5a813508b0b72a2061297a936ce81"/>
31
  <dir name="Basic">
32
  <file name="Grid.php" hash="b6a78230ba28fbcee4d307ad38e840a9"/>
33
  </dir>
34
  <file name="Basic.php" hash="03f04c46cdb5077733cc417c0d10bd72"/>
35
+ <file name="Chart.php" hash="017cc9224071b175d8916611a416e9bc"/>
36
  <dir name="Renderer">
37
  <file name="Ip.php" hash="5bd831a03c1c6400e4fdaf870c68fc31"/>
38
  <file name="Status.php" hash="bf96de45d6a88ae4b2d4ac3517923ad5"/>
55
  </dir>
56
  </dir>
57
  <dir name="etc">
58
+ <file name="config.xml" hash="10d0f4a54626150bf80e8bfc148c0317"/>
59
  <file name="system.xml" hash="401cd5b8c13f9c092f2838172da714ff"/>
60
  </dir>
61
  <dir name="Helper">
64
  <dir name="Model">
65
  <dir name="Mysql4">
66
  <dir name="Watchlog">
67
+ <file name="Collection.php" hash="5f02d8093e9c8196f0b8975248b1102f"/>
68
  </dir>
69
  <file name="Watchlog.php" hash="091d0b82dabc51de01108b29ac6f1f2b"/>
70
  </dir>
109
  </target>
110
  <target name="mageetc">
111
  <dir name="modules">
112
+ <file name="Wyomind_Watchlog.xml" hash="7555645803666036cdd714ac9e5c1e15"/>
113
  </dir>
114
  </target>
115
  </contents>