Commitf88a431

authored

Merge branch '4.0' into 4.0

2 parentsba60536 +b3bfa28 commitf88a431Copy full SHA for f88a431

File tree

+267

-106

lines changed

+267

-106

lines changed

Lines changed: 39 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,45 @@`
`8`	`8`
`9`	`9`	`##CHANGELOG`
`10`	`10`
	`11`	`+###v4.41.1 - 03-05-2022`
	`12`	`+`
	`13`	`+- Fix Field::attr() doc block.`
	`14`	`+`
	`15`	`+###v4.41.0 - 10-07-2021`
	`16`	`+`
	`17`	`+- Add exportFormat method.#160`
	`18`	`+`
	`19`	`+###v4.40.0 - 10-04-2021`
	`20`	`+`
	`21`	`+- Add method getTableId()#159`
	`22`	`+`
	`23`	`+###v4.39.1 - 09-12-2021`
	`24`	`+`
	`25`	`+- Fix doc block and add array as acceptable Column editField value.`
	`26`	`+`
	`27`	`+###v4.39.0 - 09-12-2021`
	`28`	`+`
	`29`	`+- Add missing select field options as of Editor 1.5.4.`
	`30`	`+`
	`31`	`+###v4.38.0 - 06-20-2021`
	`32`	`+`
	`33`	`+- Fix fetching of editor table#158`
	`34`	`+- Add method to get all editors instances.`
	`35`	`+- Add method to get dataTable options array.`
	`36`	`+- Set serverSide and processing option as true by default.`
	`37`	`+`
	`38`	`+###v4.37.0 - 05-17-2021`
	`39`	`+`
	`40`	`+- Implement authorizations on Editor builder.`
	`41`	`+`
	`42`	`+###v4.36.3 - 04-23-2021`
	`43`	`+`
	`44`	`+- Fix conflicts with createInline button. Use render instead of altering the data.`
	`45`	`+`
	`46`	`+###v4.36.2 - 03-19-2021`
	`47`	`+`
	`48`	`+- Fix exportable flag, should be false.`
	`49`	`+`
`11`	`50`	`###v4.36.1 - 12-05-2020`
`12`	`51`
`13`	`52`	`- Fix adding of class on Select plugin / extension.[#154]`

Lines changed: 16 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,10 @@ public function __construct(Repository $config, Factory $view, HtmlBuilder $html`
`78`	`78`	`$this->html =$html;`
`79`	`79`	`$this->collection =newCollection;`
`80`	`80`	`$this->tableAttributes =$this->config->get('datatables-html.table', []);`
	`81`	`+$this->attributes = [`
	`82`	`+'serverSide' =>true,`
	`83`	`+'processing' =>true,`
	`84`	`+ ];`
`81`	`85`	`}`
`82`	`86`
`83`	`87`	`/**`
`@@ -118,9 +122,18 @@ public function generateScripts()`
`118`	`122`	`*/`
`119`	`123`	`publicfunctiongenerateJson()`
`120`	`124`	`{`
`121`		`-$args =array_merge(`
`122`		`-$this->attributes,`
`123`		`- [`
	`125`	`+return$this->parameterize($this->getOptions());`
	`126`	`+ }`
	`127`	`+`
	`128`	`+/**`
	`129`	`+ * Get DataTable options array.`
	`130`	`+ *`
	`131`	`+ * @return array`
	`132`	`+ */`
	`133`	`+publicfunctiongetOptions()`
	`134`	`+ {`
	`135`	`+returnarray_merge(`
	`136`	`+$this->attributes, [`
`124`	`137`	`'ajax' =>$this->ajax,`
`125`	`138`	`'columns' =>$this->collection->map(function (Column$column) {`
`126`	`139`	`$column =$column->toArray();`
`@@ -130,8 +143,6 @@ public function generateJson()`
`130`	`143`	`})->toArray(),`
`131`	`144`	`]`
`132`	`145`	`);`
`133`		`-`
`134`		`-return$this->parameterize($args);`
`135`	`146`	`}`
`136`	`147`
`137`	`148`	`/**`

Comments

(0)