Skip to content
This repository was archived by the owner on Sep 14, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
866a7cd
first wip version (see README.md for changes)
mage-eag Sep 19, 2014
a125e6e
note about backwards compatibility
mage-eag Sep 22, 2014
f347f95
- implemented filter modes for text columns (including regexes)
mage-eag Sep 22, 2014
e73aa3f
renamed the default grid profile
mage-eag Sep 22, 2014
9951d1a
fix for wrong method call (custom column with renderer)
mage-eag Sep 22, 2014
728421a
fix upgrade script
mage-eag Sep 22, 2014
876e437
note about upgrade and cache
mage-eag Sep 22, 2014
1dc7d71
fix for IE 8
mage-eag Sep 24, 2014
8551b8f
fix for new grids detection
mage-eag Sep 24, 2014
aab5511
fix custom grid exports
mage-eag Sep 24, 2014
ba3c577
implemented context menu for the profiles list, in place of the actio…
mage-eag Sep 24, 2014
a8b41b1
fix for custom grid exports
mage-eag Sep 24, 2014
5c45ac0
implemented dynamic configuration shortcuts for the text filters
mage-eag Sep 24, 2014
14b6662
enable text filter shortcuts by default
mage-eag Sep 24, 2014
c418b43
fix for already rewrited grids
mage-eag Sep 24, 2014
8726492
- various fixes for grids detection and preparation
mage-eag Sep 24, 2014
ceab8f9
- implemented multiple togglable fieldsets for configuration windows
mage-eag Sep 26, 2014
39440d0
- added to the country renderer the advanced filtering possibilities …
mage-eag Sep 29, 2014
0bb2164
fixed misleading typo in README.md
mage-eag Sep 29, 2014
ce0e181
- global cleanup of the coding style
mage-eag Oct 13, 2014
2983c06
removed obsolete files
mage-eag Oct 13, 2014
28c2a61
fix for custom columns (missing methods)
mage-eag Oct 13, 2014
01929b6
fix for profiles actions (wrong parameters used)
mage-eag Oct 13, 2014
8f7c1c2
added detection of empty default date filter
mage-eag Oct 13, 2014
bf50e6e
- small performance improvements for the products grid
mage-eag Oct 15, 2014
ffc399c
- french translations cleanup
mage-eag Oct 16, 2014
6fc027b
fixes for the categories custom column
mage-eag Oct 21, 2014
175d8b9
updated README.md to reflect what is currently under work
mage-eag Oct 27, 2014
f6b4bf8
- implemented remembered session parameters for profiles
mage-eag Oct 30, 2014
d656129
- coding style cleanup
mage-eag Oct 31, 2014
af25935
- more code cleanup
mage-eag Oct 31, 2014
f42ceb2
New button styles, removed context menu.
paales Nov 1, 2014
c111395
Remove pagination
paales Nov 1, 2014
c54a186
Cleaned up button toolbar, hide buttons when not nessesairy
paales Nov 1, 2014
f0868e6
If pager isn't visible, you cant set the default values.
paales Nov 1, 2014
08414d1
Add tab button styling
paales Nov 1, 2014
5151e44
small fix
paales Nov 1, 2014
a10aef3
Added DE Locale in Modman File
sprankhub Oct 31, 2014
261ea65
Plus icon styling
paales Nov 3, 2014
d3d9418
Add proper tabs styling
paales Nov 4, 2014
c1712f5
Small styling fixes
paales Nov 4, 2014
a92f6e5
Reapply Default Filter > Reset Filter
paales Nov 4, 2014
4eb36f4
Merge pull request #117 from paales/interface
mage-eag Nov 6, 2014
836e4d0
Transparent button styles
paales Nov 6, 2014
3870a66
Even lighter
paales Nov 6, 2014
bfb9b38
Active state color
paales Nov 6, 2014
9af06bb
Button color #dddddd
paales Nov 6, 2014
11d502f
Merge pull request #119 from paales/white
mage-eag Nov 10, 2014
a0cb683
various bug fixes + removed ContextMenu JS plugin
mage-eag Nov 10, 2014
2d596ca
Merge branch '1.0.0-wip' of https://github.com/mage-eag/mage-enhanced…
mage-eag Nov 12, 2014
7f862cd
- reworked the way the base profile is handled
mage-eag Nov 12, 2014
eeac5c0
- reduced complexity in F-rated operations from Scrutinizer
mage-eag Nov 13, 2014
9593abb
- reduced complexity for the last F-rated method
mage-eag Nov 13, 2014
98511e3
fixed a typo
mage-eag Nov 13, 2014
c529d6e
- fixed grids deletion
mage-eag Nov 14, 2014
5bd5f50
- do not rewrite grid blocks without type
mage-eag Nov 14, 2014
d1e9938
various bug fixes
mage-eag Nov 19, 2014
c3e4636
- fixed invalid source models
mage-eag Nov 19, 2014
1b46532
fixed wrong quotes in setup file
mage-eag Nov 20, 2014
9a840c2
fixed wrong method call
mage-eag Nov 21, 2014
2327fdd
fix for profile action buttons (submit was natively triggered with En…
mage-eag Nov 25, 2014
13d429d
small fix for previous commit
mage-eag Nov 25, 2014
6afd05a
various fixes
mage-eag Apr 13, 2015
5f57826
Make composer definition compatible with advised version
jappievw Feb 27, 2015
0fac87b
Ensure no files created in Block/Rewrite directory will be committed
Apr 28, 2015
283e80b
Fix issue with upgrade script 1.0.0-1.0.0.1
arollason Jan 7, 2015
303523d
Make grid model type loading respect sort orders
Mar 24, 2015
3ba75ee
Fix bug with exporting collections on any grid in older Magento versions
Apr 9, 2015
b3515e4
Add new column renderer for CSV fields.
Apr 14, 2015
6271f7b
Fix incompatibilities with Magento 1.6CE+/1.11EE+
Apr 15, 2015
6d4da15
Fix bug with incorrect number of columns in columns list grids
Apr 15, 2015
13792e8
Merge pull request #168 from mwgamble/gitignore_fix
mage-eag Apr 30, 2015
f3c0e7f
Merge pull request #169 from mwgamble/upgrade_script_fix
mage-eag Apr 30, 2015
b9564cc
Merge pull request #173 from mwgamble/redirect_on_error_when_downloading
mage-eag Apr 30, 2015
9dcca68
Merge pull request #175 from mwgamble/new_magento_compatibility_fixes
mage-eag Apr 30, 2015
50b48c9
Merge pull request #177 from mwgamble/column_list_heading_bug
mage-eag Apr 30, 2015
90ee427
Merge pull request #174 from mwgamble/add_csv_column_renderer
mage-eag Apr 30, 2015
63dcf5f
allow duplicate-based custom columns to select fields from any table …
mage-eag May 1, 2015
0f2ceeb
Merge pull request #172 from mwgamble/respect_sort_orders
mage-eag May 5, 2015
60e55dc
set the current block values to the custom column models between each…
mage-eag May 12, 2015
688bbc4
Typo fix for "occurred"
May 14, 2015
b9b722b
Merge pull request #183 from mwgamble/typo_fix
mage-eag May 20, 2015
82dd9d8
Small PHPDoc improvements
May 15, 2015
c4ddeb9
Add source models for payment methods and shipping methods
May 15, 2015
94d0874
Merge pull request #184 from mwgamble/phpdoc_improvements
mage-eag May 22, 2015
ac1af7a
Merge pull request #185 from mwgamble/new_source_models
mage-eag May 22, 2015
91759a6
- separate quantity values for the order items list
mage-eag Jun 2, 2015
aee5bea
various comment fixes
mage-eag Jun 2, 2015
8f29ba9
fixed multi-line extends for PSR-2 compliance (experimental)
mage-eag Jun 2, 2015
ea3fba3
various small fixes
mage-eag Jun 2, 2015
55b81f0
- fixed setup constraints
mage-eag Jun 3, 2015
0249afb
fixed and improved profiles bar display (not broken anymore with smal…
mage-eag Jun 4, 2015
1fe2b8f
fixed default state for customizable sales items lists
mage-eag Jun 5, 2015
d6e9639
cleaned source models
mage-eag Jun 5, 2015
83a3676
reduced code duplication
mage-eag Jun 5, 2015
150a46d
fixed product stats columns + reverted invalid comment change
mage-eag Jun 5, 2015
9a97241
- moved permissions-related code from grid model to a new model
mage-eag Jun 10, 2015
e01323e
added customer email as custom column to the orders grid
mage-eag May 22, 2014
630d433
- added "weight" custom column for the orders grid
mage-eag Jun 11, 2015
82421f8
simple scrollable profiles list
mage-eag Jun 12, 2015
857970d
applied the "product" grid type to the "adminhtml/sales_order_create_…
mage-eag Jun 12, 2015
f8ddf02
fixed select filtering in some specific cases
mage-eag Jun 17, 2015
0168d22
improved image attributes detection
mage-eag Jun 17, 2015
50b44a1
fixed profiles list in some specific cases
mage-eag Jun 17, 2015
211e912
added missing comments
mage-eag Jun 17, 2015
86067d2
fixed quantity display in customizable items lists
mage-eag Jun 29, 2015
8887753
better sorting of the grid types option hash
mage-eag Jun 29, 2015
aab5e79
fixed grid export when some rows are selected via mass-action checkboxes
mage-eag Jun 29, 2015
00f5c92
added "product frontend link" custom column for the products grid (ex…
mage-eag Jun 29, 2015
476300e
fixed some more "occured" typos
mage-eag Jun 29, 2015
9e88935
Fixed Call to call_user_func_array
sprankhub Jul 8, 2015
2064512
Merge pull request #202 from sprankhub/patch-1
mage-eag Jul 8, 2015
181b6f5
added support for the newsletter-based grids
mage-eag Jul 8, 2015
a1b97df
Merge branch '1.0.0-wip' of https://github.com/mage-eag/mage-enhanced…
mage-eag Jul 8, 2015
8bc41ea
implemented missing _isAllowed() methods
mage-eag Jul 9, 2015
a3b43b2
Add custom column for store code to Manage Stores grid
Apr 15, 2015
69318ea
Add support for adding action columns to grids that don't have them
Aug 3, 2015
f7f8f0f
Add custom grid model for ratings grid
Mar 24, 2015
a484bff
updated README.md with a more detailed todo-list
mage-eag Aug 3, 2015
5703bf8
Merge pull request #171 from mwgamble/add_edit_column_to_grids
mage-eag Aug 4, 2015
9de348d
Merge pull request #176 from mwgamble/store_code_managestores_grid
mage-eag Aug 4, 2015
a512d8b
updated composer.json with some more informations
mage-eag Aug 6, 2015
89e2a30
apply changes related to SUPEE-6788 / APPSEC-1034
mage-eag Oct 23, 2015
5d9cb67
fix changed CSS classes
mage-eag Oct 23, 2015
9722948
Fix URLs that weren't fixed properly when applying SUPEE-6788 changes
Nov 25, 2015
829e4c4
Merge pull request #249 from mwgamble/url_fixes
mage-eag Nov 25, 2015
3e4f7f4
- editor system refactoring (wip)
mage-eag Feb 15, 2016
2700bde
small fixes
mage-eag Feb 15, 2016
584cfa7
reduced code complexity and duplication in the base editor model
mage-eag Feb 15, 2016
2dd9eaa
fixed edited attribute value rendering
mage-eag Feb 15, 2016
65d35bc
- implemented custom columns editability
mage-eag Feb 17, 2016
80627e3
reduced code duplication in BL_CustomGrid_Model_Grid_Editor_Abstract
mage-eag Feb 17, 2016
1ad195b
reduced code duplication between BL_CustomGrid_Model_Grid and BL_Cust…
mage-eag Feb 17, 2016
6520aaf
code refactoring
mage-eag Feb 18, 2016
ac0faf0
various fixes for the tax rules editor
mage-eag Feb 18, 2016
c086749
improved order address fields editor
mage-eag Feb 18, 2016
9270b98
fixed product categories column
mage-eag Feb 18, 2016
c38558a
fixed premature use of the editor context
mage-eag Feb 18, 2016
8bbbfb9
code refactoring
mage-eag Feb 18, 2016
24a4b26
code refactoring
mage-eag Feb 19, 2016
a659dcd
code refactoring
mage-eag Feb 19, 2016
b3d428c
code refactoring
mage-eag Feb 19, 2016
99077bb
fixed previous commit
mage-eag Feb 19, 2016
938a1ba
reduced code complexity / duplication (experimental)
mage-eag Feb 20, 2016
9801d24
code refactoring
mage-eag Feb 22, 2016
fb84055
- refactored the inventory columns code
mage-eag Mar 4, 2016
5c3b296
fixed possibly undefined variable
mage-eag Mar 4, 2016
59024bb
updated the final steps before beta release
mage-eag Mar 4, 2016
150ae53
code refactoring
mage-eag Mar 4, 2016
da15fff
small code refactoring
mage-eag Mar 4, 2016
01c359a
reduced code duplication
mage-eag Mar 5, 2016
e713813
experimental: moved the columns list form to a dedicated window (to a…
mage-eag Mar 7, 2016
cca6f8b
split the grid resource model
mage-eag Mar 7, 2016
a26bffa
split the default editor renderer block into multiple sub blocks (the…
mage-eag Mar 7, 2016
977c542
Merge branch '1.0.0-wip-edge' of https://github.com/mage-eag/mage-enh…
mage-eag Mar 7, 2016
448e9d3
fixed commit a26bffa91a92f4e5e9e81ff175d38509157c6cae
mage-eag Mar 7, 2016
cd77264
reduced complexity in multiselect renderer
mage-eag Mar 7, 2016
5cae325
experimental: moved the profiles bar in its own block
mage-eag Mar 7, 2016
5cfdd7f
- experimental: split the grid "applier" worker model into some new w…
mage-eag Mar 8, 2016
acb8a7e
fixed the profiles bar
mage-eag Mar 8, 2016
27ca1a6
reduced code complexity in the observer model
mage-eag Mar 8, 2016
7132d65
reduced complexity in the observer model
mage-eag Mar 8, 2016
e88b74c
some code refactoring in the controllers
mage-eag Mar 8, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
34 changes: 34 additions & 0 deletions .scrutinizer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# language: php

inherit: true

filter:
excluded_paths: [js/*, skin/*]

checks:
php:
code_rating: true
duplication: true

tools:
external_code_coverage: false
php_code_coverage: false
php_code_sniffer:
config:
standard: 'Zend'
php_sim: true
php_cs_fixer: true
php_mess_detector: true
php_pdepend: true
php_analyzer: true
sensiolabs_security_checker: true

build:
environment:
php: '5.4.28'

build_failure_conditions:
- 'elements.rating(<= D).exists'
- 'issues.count > 40'
- 'issues.severity(>= MAJOR).exists'
- 'project.metric("scrutinizer.quality", < 9)'
34 changes: 23 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
# Enhanced Admin Grids

[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/mage-eag/mage-enhanced-admin-grids/badges/quality-score.png?b=1.0.0-wip-edge)](https://scrutinizer-ci.com/g/mage-eag/mage-enhanced-admin-grids/?branch=1.0.0-wip-edge) [![Build Status](https://scrutinizer-ci.com/g/mage-eag/mage-enhanced-admin-grids/badges/build.png?b=1.0.0-wip)](https://scrutinizer-ci.com/g/mage-eag/mage-enhanced-admin-grids/build-status/1.0.0-wip)

Enhanced Admin Grids extension for Magento.
More informations about the extension can be found on its Magento Connect page here : https://www.magentocommerce.com/magento-connect/enhanced-admin-grids-editor.html
# Enhanced Admin Grids
## Version 1.0.0 (work-in-progress / edge)

_The new version is now under development, and should include :_
- first wave of massive code refactoring (goals: clean-up almost every part of the code for a better maintainability, more consistency, more independence, better practices and a smaller footprint)
- refined permissions
- profiles system (for each grid, will allow to use different columns lists and parameters, assignable to different roles)
- advanced filtering possibilities for text and options columns
- in-grid customizations saved via Ajax, so that the pages do not (annoyingly) reload when customizations are saved from (eg) a product view tab
_This version includes the latest changes which are considered too experimental to be featured in the [base work-in-progress branch](https://github.com/mage-eag/mage-enhanced-admin-grids/tree/1.0.0-wip). As such, it should only be used for testing purposes._

No time frame for the moment, but a development version should hopefully be available within a month or two
### Final steps before beta release
- [ ] last waves of code refactoring/cleanup and complexity reduction (focus on [Scrutinizer hot spots](https://scrutinizer-ci.com/g/mage-eag/mage-enhanced-admin-grids/code-structure/1.0.0-wip/hot-spots))
- [ ] **editor system refactoring** :
- [X] separate responsibilities into different models, introduce callbacks
- [X] implement custom columns editability
- [X] implement order address columns editability
- [X] implement inventory columns editability
- [ ] create a spreadsheet summarizing the compatibility of each editor across the different Magento versions (use three different states : "untested", "tested and functional", "tested with problems" - provide links to the related issues -)
- [ ] start filling up the compatibility spreadsheet
- [ ] **JS code refactoring** :
- [ ] remove `CDATA` sections
- [ ] refactor and optimize code when possible
- [ ] review the code style (follow some best practices)
- [ ] ~~write comments (use [JSDoc](http://usejsdoc.org/index.html))~~ **(probably not worth the time)**
- [ ] implement an object manager, to remove as much clutter as possible from the global scope, and automatically cleanup unneeded/overridable objects (especially for Ajax grids)
- [X] move the columns list form to dedicated window, as for the other forms (avoid cluttering any external wrapping form with a lot of parameters)
- [X] rework the profiles bar so that the number of displayed profiles is adapted to the available width
- [ ] rework the "Access All" profiles permission (make all the profiles be available from everywhere, except in the bar)
- [ ] ~~rework the sales items columns (implement the advanced text filter, improve their extensibility, and allow to display a customizable value when exported)~~ **(later)**

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,29 @@
*
* @category BL
* @package BL_CustomGrid
* @copyright Copyright (c) 2012 Benoît Leulliette <benoit.leulliette@gmail.com>
* @copyright Copyright (c) 2015 Benoît Leulliette <benoit.leulliette@gmail.com>
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class BL_CustomGrid_Block_Column_Renderer_Attribute
extends BL_CustomGrid_Block_Column_Renderer_Abstract
class BL_CustomGrid_Block_Column_Renderer_Attribute_Config extends BL_CustomGrid_Block_Column_Renderer_Config_Abstract
{
protected function _getController()
{
return 'column_renderer_attribute';
}

protected function _getFormId()
public function getFormId()
{
return 'column_renderer_attribute_options_form';
}

public function getFormHtml()
{
$html = '<div class="blcg-attribute-renderer-help">' . $this->getRenderer()->getHelp() . '</div>';
$html .= parent::getFormHtml();
return $html;
return 'blcg_column_renderer_attribute_config_form';
}

/**
* Return the current attribute column renderer
*
* @return BL_CustomGrid_Model_Column_Renderer_Attribute_Abstract
*/
public function getRenderer()
{
return Mage::registry('current_attribute_column_renderer');
return Mage::registry('blcg_attribute_column_renderer');
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,29 @@
*
* @category BL
* @package BL_CustomGrid
* @copyright Copyright (c) 2012 Benoît Leulliette <benoit.leulliette@gmail.com>
* @copyright Copyright (c) 2015 Benoît Leulliette <benoit.leulliette@gmail.com>
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class BL_CustomGrid_Block_Column_Renderer_Attribute_Config_Form
extends BL_CustomGrid_Block_Column_Renderer_Config_Form_Abstract
{
protected function _getFormId()
class BL_CustomGrid_Block_Column_Renderer_Attribute_Config_Form extends BL_CustomGrid_Block_Column_Renderer_Config_Form_Abstract
{
public function getFormId()
{
return 'column_renderer_attribute_options_form';
return 'blcg_column_renderer_attribute_config_form';
}

public function getRendererType()
{
return 'attribute';
}

/**
* Return the current attribute column renderer
*
* @return BL_CustomGrid_Model_Column_Renderer_Attribute_Abstract
*/
public function getRenderer()
{
if (!$renderer = Mage::registry('current_attribute_column_renderer')) {
Mage::throwException($this->__('Renderer is not specified'));
}
return $renderer;
return Mage::registry('blcg_attribute_column_renderer');
}
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,29 @@
*
* @category BL
* @package BL_CustomGrid
* @copyright Copyright (c) 2012 Benoît Leulliette <benoit.leulliette@gmail.com>
* @copyright Copyright (c) 2015 Benoît Leulliette <benoit.leulliette@gmail.com>
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
*/

class BL_CustomGrid_Block_Column_Renderer_Collection
extends BL_CustomGrid_Block_Column_Renderer_Abstract
class BL_CustomGrid_Block_Column_Renderer_Collection_Config extends BL_CustomGrid_Block_Column_Renderer_Config_Abstract
{
protected function _getController()
{
return 'column_renderer_collection';
}

protected function _getFormId()
public function getFormId()
{
return 'column_renderer_collection_options_form';
}

public function getFormHtml()
{
$html = '<div class="blcg-collection-renderer-help">' . $this->getRenderer()->getHelp() . '</div>';
$html .= parent::getFormHtml();
return $html;
return 'blcg_column_renderer_collection_config_form';
}

/**
* Return the current collection column renderer
*
* @return BL_CustomGrid_Model_Column_Renderer_Collection_Abstract
*/
public function getRenderer()
{
return Mage::registry('current_collection_column_renderer');
return Mage::registry('blcg_collection_column_renderer');
}
}
}
Loading