tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FEATURE SSF-25 : change to use GridField for showing searched results in stead of TableListField

Browse Source
This commit is contained in:
Normann Lou 2012-03-08 19:31:24 +13:00
parent 7d956de754
commit d24c2ef1ed
1 changed files with 11 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
admin/code/ModelAdmin.php
View File

@ -125,7 +125,7 @@ abstract class ModelAdmin extends LeftAndMain {
* Class name of the form field used for the results list. Overloading this in subclasses * Class name of the form field used for the results list. Overloading this in subclasses
* can let you customise the results table field. * can let you customise the results table field.
*/ */
protected $resultsTableClassName = 'TableListField'; protected $resultsTableClassName = 'GridField';
/** /**
* Return {@link $this->resultsTableClassName} * Return {@link $this->resultsTableClassName}
@ -651,19 +651,6 @@ class ModelAdmin_CollectionController extends Controller {
function search($request, $form) { function search($request, $form) {
// Get the results form to be rendered // Get the results form to be rendered
$resultsForm = $this->ResultsForm(array_merge($form->getData(), $request)); $resultsForm = $this->ResultsForm(array_merge($form->getData(), $request));
// Before rendering, let's get the total number of results returned
$tableField = $resultsForm->Fields()->dataFieldByName($this->modelClass);
$tableField->addExtraClass('resultsTable');
$numResults = $tableField->TotalCount();
if($numResults) {
$msg = sprintf(
_t('ModelAdmin.FOUNDRESULTS',"Your search found %s matching items"),
$numResults
);
} else {
$msg = _t('ModelAdmin.NORESULTS',"Your search didn't return any matching items");
}
return new SS_HTTPResponse( return new SS_HTTPResponse(
$resultsForm->forTemplate(), $resultsForm->forTemplate(),
200, 200,
@ -715,37 +702,21 @@ class ModelAdmin_CollectionController extends Controller {
* *
* @param array $searchCriteria passed through from ResultsForm * @param array $searchCriteria passed through from ResultsForm
* *
* @return TableListField * @return GridField
*/ */
function getResultsTable($searchCriteria) { function getResultsTable($searchCriteria) {
$summaryFields = $this->getResultColumns($searchCriteria);
$className = $this->parentController->resultsTableClassName(); $className = $this->parentController->resultsTableClassName();
$tf = new $className( $datalist = $this->getSearchQuery($searchCriteria);
$tf = Object::create($className,
$this->modelClass, $this->modelClass,
$this->modelClass, false,
$summaryFields $datalist,
); $fieldConfig = GridFieldConfig_RecordEditor::create()
->addComponent(new GridFieldExporter())
$tf->setCustomQuery($this->getSearchQuery($searchCriteria)); )->setDisplayFields($this->getResultColumns($searchCriteria));
$tf->setPageSize($this->parentController->stat('page_length'));
$tf->setShowPagination(true); $fieldConfig->getComponentByType('GridFieldPaginator')->setItemsPerPage($this->parentController->stat('page_length'));
// @todo Remove records that can't be viewed by the current user
$tf->setPermissions(array_merge(array('view','export'), TableListField::permissions_for_object($this->modelClass)));
// csv export settings (select all columns regardless of user checkbox settings in 'ResultsAssembly')
$exportFields = $this->getResultColumns($searchCriteria, false);
$tf->setFieldListCsv($exportFields);
$url = '<a href=\"' . $this->Link() . '/$ID/edit\">$value</a>';
if(count($summaryFields)) {
$tf->setFieldFormatting(array_combine(
array_keys($summaryFields),
array_fill(0,count($summaryFields), $url)
));
}
return $tf; return $tf;
} }
@ -757,7 +728,6 @@ class ModelAdmin_CollectionController extends Controller {
* @return Form * @return Form
*/ */
function ResultsForm($searchCriteria) { function ResultsForm($searchCriteria) {
if($searchCriteria instanceof SS_HTTPRequest) $searchCriteria = $searchCriteria->getVars(); if($searchCriteria instanceof SS_HTTPRequest) $searchCriteria = $searchCriteria->getVars();
$tf = $this->getResultsTable($searchCriteria); $tf = $this->getResultsTable($searchCriteria);