Merge branch 'warehouse-add-order' into 'master'
TTCrud fixed Error See merge request fronk/thetool!978
This commit is contained in:
@@ -42,15 +42,20 @@ class TTCrud extends mfBaseController {
|
||||
* @return array
|
||||
*/
|
||||
protected function getCheckArray(): array {
|
||||
return array_map(fn($column) => [
|
||||
'required' => $column['required'] ?? false,
|
||||
'required_length' => $column['required_length'] ?? 0,
|
||||
'title' => $column['text'] ?? $column['key'],
|
||||
'regex' => $column['regex'] ?? false
|
||||
], $this->columns);
|
||||
$checkArray = [];
|
||||
|
||||
foreach ($this->columns as $column) {
|
||||
$checkArray[$column['key']] = ['required' => $column['required'] ?? false,
|
||||
'required_length' => $column['required_length'] ?? 0,
|
||||
'title' => $column['text'] ?? $column['key'],
|
||||
'regex' => $column['regex'] ?? false];
|
||||
}
|
||||
|
||||
return $checkArray;
|
||||
}
|
||||
|
||||
|
||||
|
||||
protected function indexAction() {
|
||||
$this->layout()->set('additionalJS', ['js/pages/WarehouseHistory/WarehouseHistoryModal.js']);
|
||||
$pageName = (defined('BASEDIR') && file_exists(BASEDIR . "/public/js/pages/{$this->mod}/{$this->mod}.js"))
|
||||
|
||||
Reference in New Issue
Block a user