diff --git a/modules/entities/class/class_manage_listdiff_Abstract.php b/modules/entities/class/class_manage_listdiff_Abstract.php index 793de7c05f8d92eb867da248724230f1ce3280a6..753a202db819caef20efc57b96cc61173847fdbc 100755 --- a/modules/entities/class/class_manage_listdiff_Abstract.php +++ b/modules/entities/class/class_manage_listdiff_Abstract.php @@ -454,7 +454,7 @@ abstract class diffusion_list_Abstract extends functions } //Modification du dest_user dans la table res_letterbox if ($role_id == 'dest' && $collId == 'letterbox_coll') { - $stmt = $db->query('update '.RES_LETTERBOX.' set dest_user = ? where res_id = ?', array($userId, $resId)); + $stmt = $db->query('update res_letterbox set dest_user = ? where res_id = ?', array($userId, $resId)); } if ($processDate != '') { diff --git a/src/app/resource/controllers/ResController.php b/src/app/resource/controllers/ResController.php index 51b34a439c829a62c33ce9ab2ec65d81a7f518f8..ddb2fff4fc4832f7c65cb96ec45f7ad8d43f37ae 100755 --- a/src/app/resource/controllers/ResController.php +++ b/src/app/resource/controllers/ResController.php @@ -70,7 +70,7 @@ class ResController $mandatoryColumns = ['type_id']; foreach ($data['data'] as $value) { foreach ($mandatoryColumns as $columnKey => $column) { - if ($column == $value['column']) { + if ($column == $value['column'] && !empty($value['value'])) { unset($mandatoryColumns[$columnKey]); } } diff --git a/src/core/controllers/CoreController.php b/src/core/controllers/CoreController.php index da934ec11abeaf5216ac9f54d21d7e79367e15d9..0302bac10cd81d6a3c8941d540053019c1cce5fa 100644 --- a/src/core/controllers/CoreController.php +++ b/src/core/controllers/CoreController.php @@ -35,20 +35,32 @@ class CoreController $aInit['user']['entities'] = UserModel::getEntitiesById(['userId' => $GLOBALS['userId']]); $aInit['scriptsToinject'] = []; + $scriptsToInject = []; - $scriptsToInject = scandir('dist'); - foreach ($scriptsToInject as $value) { + $scripts = scandir('dist'); + foreach ($scripts as $value) { if (strstr($value, 'runtime.') !== false || strstr($value, 'main.') !== false || strstr($value, 'vendor.') !== false || strstr($value, 'scripts.') !== false) { if (strstr($value, '.js.map') === false) { - $aInit['scriptsToinject'][] = $value; + $scriptsToInject[] = $value; } } } - if (!empty($aInit['scriptsToinject'][3]) && strstr($aInit['scriptsToinject'][3], 'vendor.') !== false) { - $tmp = $aInit['scriptsToinject'][1]; - $aInit['scriptsToinject'][1] = $aInit['scriptsToinject'][2]; - $aInit['scriptsToinject'][2] = $tmp; + for ($i = 0; $i < count($scriptsToInject); $i++) { + foreach ($scriptsToInject as $value) { + if ($i == 0 && strstr($value, 'scripts.') !== false) { + $aInit['scriptsToinject'][] = $value; + } + if ($i == 1 && strstr($value, 'main.') !== false) { + $aInit['scriptsToinject'][] = $value; + } + if ($i == 2 && strstr($value, 'runtime.') !== false) { + $aInit['scriptsToinject'][] = $value; + } + if ($i == 3 && strstr($value, 'vendor.') !== false) { + $aInit['scriptsToinject'][] = $value; + } + } } return $response->withJson($aInit);