diff --git a/apps/maarch_entreprise/actions/process.php b/apps/maarch_entreprise/actions/process.php index 728d828cf8c82f04919e541f0a5a949e9300d7e1..3eeede66100c85648be86cade7789108d66d7816 100644 --- a/apps/maarch_entreprise/actions/process.php +++ b/apps/maarch_entreprise/actions/process.php @@ -491,7 +491,7 @@ function get_form_txt($values, $path_manage_action, $id_action, $table, $module //script $frm_str .= '<script>'; - $frmStr .= '$j("#folder").chosen({width: "100%", disable_search_threshold: 10, search_contains: true});displayFatherFolder(\'folder\'});'; + $frm_str .= '$j("#folder").chosen({width: "100%", disable_search_threshold: 10, search_contains: true});displayFatherFolder(\'folder\');'; $frm_str .= '</script>'; } diff --git a/apps/maarch_entreprise/class/class_lists_Abstract.php b/apps/maarch_entreprise/class/class_lists_Abstract.php index dd0b98780a62d6885daf2b3ef67d32721e3f7757..a3311f142218e8cb991ca7d22a1f4476a7fe4a1c 100644 --- a/apps/maarch_entreprise/class/class_lists_Abstract.php +++ b/apps/maarch_entreprise/class/class_lists_Abstract.php @@ -354,8 +354,7 @@ abstract class lists_Abstract extends Database } } $filters .='</select> '; - //$filters .= '<script>new c($(\'category_id_list\'),{width:"150px",allow_single_deselect: true});</script>'; - $filters .= '<script> $j("#category_id").chosen({width:"150px",allow_single_deselect: true});</script>'; + $filters .= '<script> $j("#category_id_list").chosen({width:"150px",allow_single_deselect: true});</script>'; break; case 'priority': diff --git a/core/Controllers/ParametersController.php b/core/Controllers/ParametersController.php index ba8168fda00705ed979aad7a6d47a1b92d5fcb46..56a7e49ffd9179e27c826e2a798da2baa2936534 100644 --- a/core/Controllers/ParametersController.php +++ b/core/Controllers/ParametersController.php @@ -22,7 +22,7 @@ use Core\Models\LangModel; use Core\Models\ParametersModel; require_once 'core/class/class_db_pdo.php'; -require_once 'modules/notes/Models/NotesModel.php'; +require_once 'modules/notes/Models/NoteModel.php'; class ParametersController { diff --git a/core/Models/ParametersModel.php b/core/Models/ParametersModel.php index eecad051d544b958edb84bf18f7827ed3863f935..098bd2ea0cd13e59e6ea1f2128382d43feded345 100644 --- a/core/Models/ParametersModel.php +++ b/core/Models/ParametersModel.php @@ -1,22 +1,8 @@ <?php namespace Core\Models; -/* - use Psr\Http\Message\RequestInterface; - use Psr\Http\Message\ResponseInterface; - use Respect\Validation\Validator; - use Core\Models\DocserverModel; - use Core\Models\DocserverTypeModel; - use Core\Models\UserModel; - use Core\Models\ParameterModel; - use Entities\Models\EntitiesModel; - use Core\Controllers\DocserverController; - use Core\Controllers\DocserverToolsController; -*/ - use Core\Models\ParametersModelAbstract; - require_once 'core/class/class_db_pdo.php'; - require_once 'modules/notes/Models/NotesModel.php'; + use Core\Models\ParametersModelAbstract; class ParametersModel extends ParametersModelAbstract { diff --git a/core/Models/ParametersModelAbstract.php b/core/Models/ParametersModelAbstract.php index c8d57a2c53572520f2fe19c8505f0d723eb56f60..331714850898a3f52e322a0d8bc577b1fd27567e 100644 --- a/core/Models/ParametersModelAbstract.php +++ b/core/Models/ParametersModelAbstract.php @@ -11,11 +11,8 @@ namespace Core\Models; -require_once 'apps/maarch_entreprise/services/Table.php'; require_once 'core/class/class_functions.php'; - - class ParametersModelAbstract extends \Apps_Table_Service { public static function getList() diff --git a/modules/tags/templates/process/index.php b/modules/tags/templates/process/index.php index f82f056bca392df0c7e5eb62b6609c304f1cd460..b7384fe27c728f0326d3630c0291c3116e077c42 100644 --- a/modules/tags/templates/process/index.php +++ b/modules/tags/templates/process/index.php @@ -58,7 +58,7 @@ $frm_str .='</td></tr><style>#tag_userform_chosen{width:95% !important;}</style> $frm_str .= '<input type="hidden" name="res_id" id="res_id" value="'.$res_id.'" />'; $frm_str .= '<input type="hidden" id="new_tag_label" name="new_tag_label"/>'; $frm_str .= '<script type="text/javascript">load_tags('.$route_tag_ui_script.', \''.$res_id.'\', \''.$coll_id.'\');'; -$frmStr .= ' $j("#tag_userform").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});'; +$frm_str .= ' $j("#tag_userform").chosen({width: "95%", disable_search_threshold: 10, search_contains: true});'; if ($core_tools->test_service('create_tag', 'tags', false) == 1) { $frm_str .= '$j( "#tag_userform_chosen input" ).focusout(function() {$j("#new_tag_label").val($j("#tag_userform_chosen input").val());if($j( "#tag_userform_chosen .no-results" ).length){if(confirm("'._ADD_TAG_CONFIRM.'")){add_this_tags('.$route_tag_add_tags_from_res.', '.$route_tag_ui_script.');}}});'; } diff --git a/modules/tags/templates/validate_mail/index.php b/modules/tags/templates/validate_mail/index.php index 823fa47610191b1eec7d4d2da6f3db1050dfcbfe..e4aed0c5ba7a73708e95182c00a8ebd90f57f1a4 100644 --- a/modules/tags/templates/validate_mail/index.php +++ b/modules/tags/templates/validate_mail/index.php @@ -63,7 +63,7 @@ $frm_str .='<style>#tag_userform_chosen{width:100% !important;}</style>'; $frm_str .= '<input type="hidden" id="new_tag_label" name="new_tag_label"/>'; $frm_str .= '<script type="text/javascript">load_tags('.$route_tag_ui_script.', \''.$res_id.'\', \''.$coll_id.'\');'; -$frmStr .= ' $j("#tag_userform").chosen({width: "226px", disable_search_threshold: 10,search_contains: true});'; +$frm_str .= ' $j("#tag_userform").chosen({width: "226px", disable_search_threshold: 10,search_contains: true});'; if ($core_tools->test_service('create_tag', 'tags', false) == 1) { $frm_str .= '$j( "#tag_userform_chosen input" ).focusout(function() {$j("#new_tag_label").val($j("#tag_userform_chosen input").val());if($j( "#tag_userform_chosen .no-results" ).length){if(confirm("'._ADD_TAG_CONFIRM.'")){add_this_tags('.$route_tag_add_tags_from_res.', '.$route_tag_ui_script.');}}});'; }