tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40 from open-sausages/pulls/4.0/fix-form-actions

Browse Source 
BUG Fix broken form actions on parent and nested gridfields
This commit is contained in:
Hamish Friedlander 2016-08-01 16:40:20 +12:00 committed by GitHub
commit 2502118a21
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/Report.php
View File

@ -158,9 +158,9 @@ class SS_Report extends ViewableData
public function getLink($action = null)
{
return Controller::join_links(
AdminRootController::admin_url(),
Config::inst()->get('ReportAdmin', 'url_segment'),
ReportAdmin::singleton()->Link('show'),
get_class($this),
$action
);

41
code/ReportAdmin.php
View File

@ -18,11 +18,8 @@ use SilverStripe\Security\PermissionProvider;
*/
class ReportAdmin extends LeftAndMain implements PermissionProvider
{
private static $url_segment = 'reports';
private static $url_rule = '/$ReportClass/$Action';
private static $menu_title = 'Reports';
private static $template_path = null; // defaults to (project)/templates/email
@ -30,7 +27,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
private static $tree_class = 'SS_Report';
private static $url_handlers = array(
'$ReportClass/$Action' => 'handleAction'
'show/$ReportClass/$Action' => 'handleAction'
);
/**
@ -50,13 +47,6 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
{
parent::init();
//set the report we are currently viewing from the URL
$this->reportClass = (isset($this->urlParams['ReportClass']) && $this->urlParams['ReportClass'] !== 'index')
? $this->urlParams['ReportClass']
: null;
$allReports = SS_Report::get_reports();
$this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
// Set custom options for TinyMCE specific to ReportAdmin
HTMLEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
HTMLEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
@ -111,6 +101,22 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
return $output;
}
public function handleAction($request, $action) {
$this->reportClass = $request->param('ReportClass');
// Check report
if ($this->reportClass) {
$allReports = SS_Report::get_reports();
if (empty($allReports[$this->reportClass])) {
return $this->httpError(404);
}
$this->reportObject = $allReports[$this->reportClass];
}
// Delegate to sub-form
return parent::handleAction($request, $action);
}
/**
* Determine if we have reports and need
* to display the "Reports" main menu item
@ -142,9 +148,9 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
if ($this->reportObject) {
//build breadcrumb trail to the current report
$items->push(new ArrayData(array(
'Title' => $this->reportObject->title(),
'Link' => Controller::join_links($this->Link(), '?' . http_build_query(array('q' => $this->request->requestVar('q'))))
)));
'Title' => $this->reportObject->title(),
'Link' => Controller::join_links($this->Link(), '?' . http_build_query(array('q' => $this->request->requestVar('q'))))
)));
}
return $items;
@ -162,13 +168,8 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider
return $this->reportObject->getLink($action);
}
// Join parent action
if($action) {
return static::join_links(parent::Link('index'), $action);
}
// Basic link to this cms section
return parent::Link();
return parent::Link($action);
}
public function providePermissions()