mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merge remote-tracking branch 'origin/3.2' into 3
This commit is contained in:
commit
1e665a59b1
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
|
.sass-cache
|
||||||
.DS_Store
|
.DS_Store
|
@ -4,6 +4,8 @@ language: php
|
|||||||
php:
|
php:
|
||||||
- 5.3
|
- 5.3
|
||||||
|
|
||||||
|
sudo: false
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- DB=MYSQL CORE_RELEASE=master
|
- DB=MYSQL CORE_RELEASE=master
|
||||||
- DB=PGSQL CORE_RELEASE=master
|
- DB=PGSQL CORE_RELEASE=master
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
* ===========================
|
* ===========================
|
||||||
*
|
*
|
||||||
* Right now, all subclasses of SS_Report will be shown in the ReportAdmin. In SS3 there is only
|
* Right now, all subclasses of SS_Report will be shown in the ReportAdmin. In SS3 there is only
|
||||||
* one place where reports can go, so this class is greatly simplifed from from its version in SS2.
|
* one place where reports can go, so this class is greatly simplifed from its version in SS2.
|
||||||
*
|
*
|
||||||
* @package reports
|
* @package reports
|
||||||
*/
|
*/
|
||||||
@ -268,8 +268,9 @@ class SS_Report extends ViewableData {
|
|||||||
new GridFieldSortableHeader(),
|
new GridFieldSortableHeader(),
|
||||||
new GridFieldDataColumns(),
|
new GridFieldDataColumns(),
|
||||||
new GridFieldPaginator(),
|
new GridFieldPaginator(),
|
||||||
new GridFieldPrintButton(),
|
new GridFieldButtonRow('after'),
|
||||||
new GridFieldExportButton()
|
new GridFieldPrintButton('buttons-after-left'),
|
||||||
|
new GridFieldExportButton('buttons-after-left')
|
||||||
);
|
);
|
||||||
$gridField = new GridField('Report',$this->title(), $items, $gridFieldConfig);
|
$gridField = new GridField('Report',$this->title(), $items, $gridFieldConfig);
|
||||||
$columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns');
|
$columns = $gridField->getConfig()->getComponentByType('GridFieldDataColumns');
|
||||||
|
@ -47,7 +47,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
|
|||||||
$this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
|
$this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
|
||||||
|
|
||||||
// Set custom options for TinyMCE specific to ReportAdmin
|
// Set custom options for TinyMCE specific to ReportAdmin
|
||||||
HtmlEditorConfig::get('cms')->setOption('ContentCSS', project() . '/css/editor.css');
|
HtmlEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css');
|
||||||
HtmlEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
|
HtmlEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang());
|
||||||
|
|
||||||
// Always block the HtmlEditorField.js otherwise it will be sent with an ajax request
|
// Always block the HtmlEditorField.js otherwise it will be sent with an ajax request
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
"homepage": "http://silverstripe.org"
|
"homepage": "http://silverstripe.org"
|
||||||
}],
|
}],
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=5.3.2",
|
"php": ">=5.3.3",
|
||||||
"silverstripe/framework": ">=3.1.x-dev"
|
"silverstripe/framework": ">=3.1.x-dev"
|
||||||
},
|
},
|
||||||
"extra": {
|
"extra": {
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
<div id="reportadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
|
<div id="reportadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
|
||||||
|
|
||||||
<div class="cms-content-header north">
|
<div class="cms-content-header north">
|
||||||
<% with EditForm %>
|
<% with $EditForm %>
|
||||||
<div class="cms-content-header-info">
|
<div class="cms-content-header-info">
|
||||||
<% include BackLink_Button %>
|
<% include BackLink_Button %>
|
||||||
<% with Controller %>
|
<% with $Controller %>
|
||||||
<% include CMSBreadcrumbs %>
|
<% include CMSBreadcrumbs %>
|
||||||
<% end_with %>
|
<% end_with %>
|
||||||
</div>
|
</div>
|
||||||
|
@ -9,19 +9,19 @@
|
|||||||
$FieldMap.ReportTitle.FieldHolder
|
$FieldMap.ReportTitle.FieldHolder
|
||||||
$FieldMap.ReportDescription.FieldHolder
|
$FieldMap.ReportDescription.FieldHolder
|
||||||
|
|
||||||
<% if FieldMap.Filters.Children %>
|
<% if $FieldMap.Filters.Children %>
|
||||||
<h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
|
<h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
|
||||||
|
|
||||||
<div class="filters">
|
<div class="filters">
|
||||||
<% loop FieldMap.Filters %>
|
<% loop $FieldMap.Filters %>
|
||||||
<% loop Children %>
|
<% loop $Children %>
|
||||||
$FieldHolder
|
$FieldHolder
|
||||||
<% end_loop %>
|
<% end_loop %>
|
||||||
<% end_loop %>
|
<% end_loop %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="action_updatereport">
|
<div id="action_updatereport">
|
||||||
<% if FieldMap.action_updatereport %>
|
<% if $FieldMap.action_updatereport %>
|
||||||
$FieldMap.action_updatereport.Field
|
$FieldMap.action_updatereport.Field
|
||||||
<% end_if %>
|
<% end_if %>
|
||||||
</div>
|
</div>
|
||||||
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
$FieldMap.ReportContent.FieldHolder
|
$FieldMap.ReportContent.FieldHolder
|
||||||
|
|
||||||
<% loop HiddenFields %>$Field<% end_loop %>
|
<% loop $HiddenFields %>$Field<% end_loop %>
|
||||||
|
|
||||||
</fieldset>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
|
Loading…
Reference in New Issue
Block a user