From c77b860ad5b4ee21549f5fbce90c66adc61a0c04 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 18 Jul 2023 17:45:27 +0200 Subject: [PATCH] wait #5334 @1.5 --- .idea/.gitignore | 8 + .idea/ccgm.iml | 9 + .idea/deployment.xml | 421 ++++++++++++++++++ .idea/misc.xml | 9 + .idea/modules.xml | 8 + .idea/php.xml | 6 + .idea/vcs.xml | 6 + .ovhconfig | 4 +- framework/application/configs/application.ini | 2 +- framework/application/forms/CMS/Team.php | 2 +- 10 files changed, 471 insertions(+), 4 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/ccgm.iml create mode 100644 .idea/deployment.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/ccgm.iml b/.idea/ccgm.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/ccgm.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 0000000..25721a1 --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,421 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b658e95 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..eace34e --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..66ea8f5 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.ovhconfig b/.ovhconfig index 0393320..8a74f13 100644 --- a/.ovhconfig +++ b/.ovhconfig @@ -1,3 +1,3 @@ app.engine=php -app.engine.version=5.6 -environement = development \ No newline at end of file +app.engine.version=7.0 +environment=development diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini index cb59499..b403d20 100644 --- a/framework/application/configs/application.ini +++ b/framework/application/configs/application.ini @@ -14,7 +14,7 @@ bin.cp = /bin/cp bin.rm = /bin/rm appnamespace = "CCGM" - +hosting.ovh.net/index.php?route=/ timezone = 'Europe/Paris' session.lifetime = 31536000 ;1 year diff --git a/framework/application/forms/CMS/Team.php b/framework/application/forms/CMS/Team.php index 77e119e..6ded6f5 100644 --- a/framework/application/forms/CMS/Team.php +++ b/framework/application/forms/CMS/Team.php @@ -26,7 +26,7 @@ class CCGM_Form_CMS_Team extends CubeIT_Form_List_Model { ->setNewTitle(__('Créer une équipe')) ->setEditTitle(sprintf(__("Edition de l'équipe « %s »"), '$name')) ->setTitleColumn('name') - ->setSortColumn('sort_order') + //->setSortColumn('sort_order') ->setAdditionnalColumns(['sort_order']) ->setModel(CCGM_Model_Team::class); } -- 2.39.5