Merge remote-tracking branch 'lrcremote/bug-fix'

This commit is contained in:
Ed 2012-10-13 12:46:39 -03:00
commit 1d49529253
4 changed files with 35 additions and 38 deletions

View File

@ -1,29 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>Website SilverStripe (SortableGridField)</name> <name>Website SilverStripe (SortableGridField)</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>
<buildSpec> <buildSpec>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name> <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.wst.validation.validationbuilder</name> <name>org.eclipse.wst.validation.validationbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
<buildCommand> <buildCommand>
<name>org.eclipse.dltk.core.scriptbuilder</name> <name>org.eclipse.dltk.core.scriptbuilder</name>
<arguments> <arguments>
</arguments> </arguments>
</buildCommand> </buildCommand>
</buildSpec> </buildSpec>
<natures> <natures>
<nature>ca.edchipman.silverstripepdt.SilverStripeNature</nature> <nature>ca.edchipman.silverstripepdt.SilverStripeNature</nature>
<nature>org.eclipse.php.core.PHPNature</nature> <nature>org.eclipse.php.core.PHPNature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature> <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures> </natures>
</projectDescription> </projectDescription>

View File

@ -1,3 +1,3 @@
eclipse.preferences.version=1 eclipse.preferences.version=1
include_path=0;/SortableGridField\u00055;ca.edchipman.silverstripepdt.LANGUAGE include_path=0;/SortableGridField\u00055;ca.edchipman.silverstripepdt.LANGUAGE
silverstripe_version=SS3.0 silverstripe_version=SS3.0

View File

@ -1,6 +1,3 @@
<?php <?php
$dir=basename(dirname(__FILE__)); define('SORTABLE_GRIDFIELD_BASE', Director::absoluteBaseURL() . basename(dirname(__FILE__)));
if($dir!='SortableGridField') {
user_error('SortableGridField: Directory name must be "SortableGridField" (currently "'.$dir.'")',E_USER_ERROR);
}
?> ?>

View File

@ -73,8 +73,8 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
//Inject Requirements //Inject Requirements
Requirements::css('SortableGridField/css/GridFieldSortableRows.css'); Requirements::css(SORTABLE_GRIDFIELD_BASE . '/css/GridFieldSortableRows.css');
Requirements::javascript('SortableGridField/javascript/GridFieldSortableRows.js'); Requirements::javascript(SORTABLE_GRIDFIELD_BASE . '/javascript/GridFieldSortableRows.js');
$args = array('Colspan' => count($gridField->getColumns()), 'ID' => $gridField->ID()); $args = array('Colspan' => count($gridField->getColumns()), 'ID' => $gridField->ID());