tonyair/silverstripe-gridfieldextensions
1
0
Fork 0
mirror of https://github.com/symbiote/silverstripe-gridfieldextensions.git synced 2024-10-22 15:05:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Brice Burgess 2014-12-06 16:34:27 -05:00
commit dd5a1036d0
4 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
code/GridFieldEditableColumns.php
View File

@ -138,7 +138,11 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
if(isset($info['callback'])) { if(isset($info['callback'])) {
$field = call_user_func($info['callback'], $record, $col, $grid); $field = call_user_func($info['callback'], $record, $col, $grid);
} elseif(isset($info['field'])) { } elseif(isset($info['field'])) {
$field = new $info['field']($col); if ($info['field'] == 'LiteralField') {
$field = new $info['field']($col, null);
}else{
$field = new $info['field']($col);
}
} }
if(!$field instanceof FormField) { if(!$field instanceof FormField) {

11
composer.json
View File

@ -1,5 +1,5 @@
{ {
"name": "ajshort/silverstripe-gridfieldextensions", "name": "silverstripe-australia/gridfieldextensions",
"description": "A collection of useful grid field components", "description": "A collection of useful grid field components",
"type": "silverstripe-module", "type": "silverstripe-module",
"homepage": "http://github.com/ajshort/silverstripe-gridfieldextensions", "homepage": "http://github.com/ajshort/silverstripe-gridfieldextensions",
@ -9,7 +9,11 @@
{ {
"name": "Andrew Short", "name": "Andrew Short",
"email": "andrewjshort@gmail.com" "email": "andrewjshort@gmail.com"
} },
{
"name": "Marcus Nyeholt",
"email": "marcus@silverstripe.com.au"
}
], ],
"support": { "support": {
"issues": "http://github.com/ajshort/silverstripe-gridfieldextensions/issues" "issues": "http://github.com/ajshort/silverstripe-gridfieldextensions/issues"
@ -23,5 +27,8 @@
"docs/en/_images/editable-rows.png", "docs/en/_images/editable-rows.png",
"docs/en/_images/add-existing-search.png" "docs/en/_images/add-existing-search.png"
] ]
},
"replace": {
"ajshort/silverstripe-gridfieldextensions": "self.version"
} }
} }

18
css/GridFieldExtensions.css
View File

@ -117,17 +117,29 @@
} }
.ss-gridfield-orderable .col-reorder { .ss-gridfield-orderable .col-reorder {
position: relative;
padding: 0 !important; padding: 0 !important;
width: 16px !important; width: 16px !important;
} }
.ss-gridfield-orderable .col-reorder .handle { .ss-gridfield-orderable .col-reorder .handle {
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
cursor: move; cursor: move;
display: none;
} }
.ss-gridfield-orderable tbody tr:hover .col-reorder .handle { .ss-gridfield-orderable .col-reorder .handle .icon {
display: block; position: absolute;
top: 50%;
left: 50%;
width: 5px;
height: 11px;
margin: -5px 0 0 -2px;
background-image: url('../../framework/thirdparty/jquery-ui-themes/smoothness/images/ui-icons_222222_256x240.png');
background-position: -5px -227px;
} }
.ss-gridfield-orderhelper { .ss-gridfield-orderhelper {

2
templates/GridFieldOrderableRowsDragHandle.ss
View File

@ -1 +1 @@
<span class="handle ui-icon ui-icon-grip-dotted-vertical"></span> <span class="handle"><span class="icon"></span></span>