Skip to content

Commit 4d0f718

Browse files
therouvtherouv
committed
Merge branch 'release/1.2.0'
2 parents dbdfaba + 3848d61 commit 4d0f718

File tree

606 files changed

+64267
-4321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

606 files changed

+64267
-4321
lines changed

‎.travis.yml‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,29 @@
11
language: php
2+
23
php:
34
- 5.3
5+
- 5.4
6+
- 5.5
7+
8+
env:
9+
- MAGENTO_VERSION="1.6.2.0"
10+
- MAGENTO_VERSION="1.7.0.2"
11+
- MAGENTO_VERSION="1.8.1.0"
12+
- MAGENTO_VERSION="1.9.0.1"
13+
414
before_install:
515
- mkdir test/
6-
- composer install --dev
16+
- curl -sS https://getcomposer.org/installer | php
17+
- chmod +x ./composer.phar
18+
- ./composer.phar --version
19+
- ./composer.phar install --dev
20+
721
before_script:
822
- CURR_DIR=$(pwd)
9-
- bin/mage-ci install test 1.7.0.2 magento_test -c -t -r http://mage-ci.ecomdev.org
23+
- bin/mage-ci install test ${MAGENTO_VERSION} magento_test -c -t -r http://mage-ci.firegento.com
1024
- bin/mage-ci install-module test $CURR_DIR
11-
- git clone https://github.com/EcomDev/EcomDev_PHPUnit.git -b dev $CURR_DIR/phpunit/
25+
- git clone https://github.com/EcomDev/EcomDev_PHPUnit.git ./phpunit/
1226
- bin/mage-ci install-module $CURR_DIR/test $CURR_DIR/phpunit/
27+
1328
script:
1429
- bin/mage-ci phpunit test

‎README.md‎

Lines changed: 54 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FireGento_AdminMonitoring
22
=========================
33

4-
The admin monitoring logs nearly every save and delete call in the backend.
4+
The admin monitoring allows an shop owner to log almost every activity in the backend.
55

66
Facts
77
-----
@@ -15,53 +15,65 @@ Builds
1515

1616
Description
1717
-----------
18-
The admin monitoring logs nearly every save and delete call in the backend. The idea is to generate an overview of the changes in the backend to know who changed certain things.
18+
The admin monitoring allows an shop owner to log almost every activity in the backend. The goal is to monitor all changes in the backend and show them in a nice view so that
19+
a shop owner can monitor who changed what, e.g. logged in to the admin account, saved a product, deleted a customer, e.g.
1920

2021
### BE CAREFUL
2122
This extension writes a lot of data into the database and we exclude only a few core classes. If you have many writes in the backend, please have a look into this to avoid a full hard disk!
2223

23-
To exclude a class, add it into the node `config/default/firegento_adminmonitoring_config/exclude/object_types`
24+
There are currently several ways if you can exclude e.g. specific models, admin routes, field names from logging data to the database:
25+
- Exclude all changes from a specific object (e.g. Mage_Index_Model_Event)
26+
- Exclude all changes from a specific admin route (e.g. admin_sales_order_create_loadBlock)
27+
- Exclude specific objects from specific admin routes (e.g. Mage_CatalogRule_Model_Flag from admin_promo_catalog_save)
28+
- Exclude specific field names from every object (e.g. created_at, updated_at)
2429

25-
```xml
26-
<config>
27-
<default>
28-
<firegento_adminmonitoring_config>
29-
<exclude>
30-
<object_types>
31-
<Mage_Index_Model_Event />
32-
<!-- omit infinite loops -->
33-
<Firegento_AdminMonitoring_Model_History />
34-
</object_types>
35-
</exclude>
36-
</firegento_adminmonitoring_config>
37-
</default>
38-
</config>
39-
```
40-
41-
You can also exclude fields like updated_at ...
30+
There is a basic *adminmonitoring.xml* file located in the "etc" folder of this extension with the following default excludes:
4231

4332
```xml
33+
<?xml version="1.0"?>
4434
<config>
45-
<default>
46-
<firegento_adminmonitoring_config>
47-
<exclude>
48-
<fields>
49-
<updated_at />
50-
<update_time />
51-
</fields>
52-
</exclude>
53-
</firegento_adminmonitoring_config>
54-
</default>
35+
<adminmonitoring>
36+
<excludes>
37+
<object_types>
38+
<Mage_Index_Model_Event/>
39+
<Mage_Admin_Model_User/>
40+
<Enterprise_Logging_Model_Event_Changes/>
41+
<Enterprise_Logging_Model_Event/>
42+
<!-- omit infinite loops -->
43+
<FireGento_AdminMonitoring_Model_History/>
44+
</object_types>
45+
<fields>
46+
<created_at/>
47+
<updated_at/>
48+
<create_time/>
49+
<update_time/>
50+
<low_stock_date/>
51+
</fields>
52+
<admin_routes>
53+
<admin_sales_order_create_index/>
54+
<admin_sales_order_create_loadBlock/>
55+
<admin_sales_order_create_save/>
56+
<admin_sales_order_invoice_save/>
57+
<admin_sales_order_shipment_save/>
58+
<admin_sales_order_creditmemo_save/>
59+
<admin_sales_order_create_reorder/>
60+
<admin_promo_catalog_save>
61+
<Mage_CatalogRule_Model_Flag/>
62+
</admin_promo_catalog_save>
63+
</admin_routes>
64+
</excludes>
65+
</adminmonitoring>
5566
</config>
5667
```
5768

69+
5870
### Third party integration
5971

6072
Events for model_save_after and model_delete_after are observed and changes automatically logged, if not excluded as described above.
6173
So even third party models will be logged and can be even better integrated by link to their adminhtml edit form.
62-
To do this observe the firegento_AdminMonitoring_rowurl event and see Firegento_AdminMonitoring_Model_RowUrl_Product for an catalog_product implementation which can be adapted.
74+
To do this observe the event **firegento_adminmonitoring_rowurl** and see **Firegento_AdminMonitoring_Model_RowUrl_Product** for an catalog_product implementation which can be adapted for your custom models.
6375

64-
If you want to log your own events just dispatch the firegento_AdminMonitoring_log event:
76+
If you want to log your own events just dispatch the event **firegento_adminmonitoring_log** and pass your custom data:
6577

6678
```php
6779
Mage::dispatchEvent(
@@ -76,9 +88,14 @@ Mage::dispatchEvent(
7688
);
7789
```
7890

91+
If you want to exclude some more fields, admin routes, object types just create a custom *adminmonitoring.xml* file
92+
in your custom module and add the necessary values in the same structure like in the default *adminmonitoring.xml* file of this extension.
93+
94+
7995
Requirements
8096
------------
8197
- PHP >= 5.3.0 (or even 5.0 as long as [spl](http://www.php.net/manual/en/book.spl.php) is activated)
98+
- PHP >= 5.5.0: json extension
8299

83100
Compatibility
84101
-------------
@@ -90,6 +107,7 @@ Installation Instructions
90107
1. Install the extension by copying all the extension files into your document root.
91108
2. Clear the cache, logout from the admin panel and then login again.
92109
3. You can now configure the extenion via *System -> Configuration -> Advanced -> Admin -> Admin Monitoring*
110+
4. You can view all logging entries in *System -> Configuration -> Admin Monitoring*
93111

94112
Uninstallation
95113
--------------
@@ -100,6 +118,8 @@ Uninstallation
100118
DROP TABLE 'firegento_adminmonitoring_history';
101119
```
102120

121+
3. Please remove all integration for the admin monitoring in your custom modules.
122+
103123
Support
104124
-------
105125
If you have any issues with this extension, open an issue on [GitHub](https://github.com/firegento/firegento-adminmonitoring/issues).
@@ -115,15 +135,12 @@ FireGento Team
115135
* Twitter: [@firegento](https://twitter.com/firegento)
116136

117137
Developers:
118-
* Tobias Zander (@airbone42)
119-
* Ralf Siepker (@mageconsult)
120-
* Carmen Bremen (@neoshops)
121-
* Fabian Blechschmidt (@Schrank)
138+
* Please see the [contributor page](https://github.com/firegento/firegento-adminmonitoring/graphs/contributors) on github.
122139

123140
License
124141
-------
125142
[GNU General Public License, version 3 (GPLv3)](http://opensource.org/licenses/gpl-3.0)
126143

127144
Copyright
128145
---------
129-
(c) 2013 FireGento Team
146+
(c) 2013-2014 FireGento Team

0 commit comments

Comments
 (0)