TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-detect correct postback handler for datatable widget. (#4967) 

This change removes the default postback handler for the datatable
widget (onSave) and instead relies on the closest form's request
handler. While `onSave` was a safe default, it did not take into account
the relation widget using other handlers.

The table widget will use an explicitly specified handler first, then it
will try and use the form's request handler, before using `onSave` as a
fallback, although this should really never occur.

Fixes #4776.
This commit is contained in:
Ben Thomson 2020-03-05 16:37:16 +08:00 committed by GitHub
parent 307a662647
commit 2f500ab034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/backend/widgets/Table.php
View File

@ -1,5 +1,7 @@
<?php namespace Backend\Widgets;
use Config;
use Backend;
use Lang;
use Input;
use Request;
@ -123,7 +125,7 @@ class Table extends WidgetBase
$this->vars['recordsKeyFrom'] = $this->recordsKeyFrom;
$this->vars['recordsPerPage'] = $this->getConfig('recordsPerPage', false) ?: 'false';
$this->vars['postbackHandlerName'] = $this->getConfig('postbackHandlerName', 'onSave');
$this->vars['postbackHandlerName'] = $this->getConfig('postbackHandlerName');
$this->vars['searching'] = $this->getConfig('searching', false);
$this->vars['adding'] = $this->getConfig('adding', true);
$this->vars['deleting'] = $this->getConfig('deleting', true);
@ -153,7 +155,15 @@ class Table extends WidgetBase
protected function loadAssets()
{
$this->addCss('css/table.css', 'core');
$this->addJs('js/build-min.js', 'core');
if (Config::get('develop.decompileBackendAssets', false)) {
$scripts = Backend::decompileAsset($this->getAssetPath('js/build.js'));
foreach ($scripts as $script) {
$this->addJs($script, 'core');
}
} else {
$this->addJs('js/build-min.js', 'core');
}
}
/**

7
modules/backend/widgets/table/assets/js/build-min.js vendored
View File

@ -21,8 +21,9 @@ this.clickHandler=this.onClick.bind(this)
this.keydownHandler=this.onKeydown.bind(this)
this.documentClickHandler=this.onDocumentClick.bind(this)
this.toolbarClickHandler=this.onToolbarClick.bind(this)
if(this.options.postback&&this.options.clientDataSourceClass=='client')
this.formSubmitHandler=this.onFormSubmit.bind(this)
if(this.options.postback&&this.options.clientDataSourceClass=='client'){if(!this.options.postbackHandlerName){var formHandler=this.$el.closest('form').data('request')
this.options.postbackHandlerName=formHandler||'onSave'}
this.formSubmitHandler=this.onFormSubmit.bind(this)}
this.navigation=null
this.search=null
this.recordsAddedOrDeleted=0
@ -383,7 +384,7 @@ if(dataContainer.value!=value){dataContainer.value=value
this.markCellRowDirty(cellElement)
this.notifyRowProcessorsOnChange(cellElement)
if(suppressEvents===undefined||!suppressEvents){this.$el.trigger('oc.tableCellChanged',[this.getCellColumnName(cellElement),value,this.getCellRowIndex(cellElement)])}}}
Table.DEFAULTS={clientDataSourceClass:'client',keyColumn:'id',recordsPerPage:false,data:null,postback:true,postbackHandlerName:'onSave',adding:true,deleting:true,toolbar:true,searching:false,rowSorting:false,height:false,dynamicHeight:false}
Table.DEFAULTS={clientDataSourceClass:'client',keyColumn:'id',recordsPerPage:false,data:null,postback:true,postbackHandlerName:null,adding:true,deleting:true,toolbar:true,searching:false,rowSorting:false,height:false,dynamicHeight:false}
var old=$.fn.table
$.fn.table=function(option){var args=Array.prototype.slice.call(arguments,1),result=undefined
this.each(function(){var $this=$(this)

9
modules/backend/widgets/table/assets/js/table.js
View File

@ -69,8 +69,13 @@
this.documentClickHandler = this.onDocumentClick.bind(this)
this.toolbarClickHandler = this.onToolbarClick.bind(this)
if (this.options.postback && this.options.clientDataSourceClass == 'client')
if (this.options.postback && this.options.clientDataSourceClass == 'client') {
if (!this.options.postbackHandlerName) {
var formHandler = this.$el.closest('form').data('request')
this.options.postbackHandlerName = formHandler || 'onSave'
}
this.formSubmitHandler = this.onFormSubmit.bind(this)
}
// Navigation helper
this.navigation = null
@ -1112,7 +1117,7 @@
recordsPerPage: false,
data: null,
postback: true,
postbackHandlerName: 'onSave',
postbackHandlerName: null,
adding: true,
deleting: true,
toolbar: true,

2
modules/backend/widgets/table/partials/_table.htm
View File

@ -6,7 +6,9 @@
data-data="<?= e($data) ?>"
data-alias="<?= e($this->alias) ?>"
data-field-name="<?= e($this->fieldName) ?>"
<?php if (!empty($postbackHandlerName)): ?>
data-postback-handler-name="<?= e($postbackHandlerName) ?>"
<?php endif; ?>
data-adding="<?= e($adding) ?>"
data-searching="<?= e($searching) ?>"
data-deleting="<?= e($deleting) ?>"