diff --git a/core/core.php b/core/core.php
index 1e2f4f7..9f6b55a 100644
--- a/core/core.php
+++ b/core/core.php
@@ -51,7 +51,7 @@ class common
const ACCESS_TIMER = 1800;
// Numéro de version
- const ZWII_VERSION = '1.14.03';
+ const ZWII_VERSION = '1.14.04';
// URL autoupdate
const ZWII_UPDATE_URL = 'https://forge.chapril.org/ZwiiCMS-Team/campus-update/raw/branch/master/';
diff --git a/core/module/course/view/userReport/userReport.php b/core/module/course/view/userReport/userReport.php
index 0c4ab4a..908af98 100644
--- a/core/module/course/view/userReport/userReport.php
+++ b/core/module/course/view/userReport/userReport.php
@@ -8,7 +8,7 @@
helper::baseUrl() . 'course/userHistoryExport/' . $this->getUrl(2) . '/' . $this->getUrl(3),
+ 'href' => helper::baseUrl() . 'course/userReportExport/' . $this->getUrl(2) . '/' . $this->getUrl(3),
'value' => template::ico('download'),
'help' => 'Exporter',
]) ?>
diff --git a/core/module/course/view/users/users.php b/core/module/course/view/users/users.php
index ae6b5f7..ed5fe90 100644
--- a/core/module/course/view/users/users.php
+++ b/core/module/course/view/users/users.php
@@ -8,7 +8,7 @@
helper::baseUrl() . 'course/usersHistoryExport/' . $this->getUrl(2),
+ 'href' => helper::baseUrl() . 'course/usersReportExport/' . $this->getUrl(2),
'value' => template::ico('download'),
'help' => 'Exporter',
]) ?>
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index 13a3b81..8a133f0 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -246,7 +246,7 @@ class init extends common
'manage' => false,
'users' => false,
'userHistory' => false,
- 'userHistoryExport' => false,
+ 'userReportExport' => false,
'usersAdd' => false,
'userDelete' => false,
'usersDelete' => false,
@@ -343,7 +343,7 @@ class init extends common
'manage' => false,
'users' => false,
'userHistory' => false,
- 'userHistoryExport' => false,
+ 'userReportExport' => false,
'usersAdd' => false,
'userDelete' => false,
'usersDelete' => false,
@@ -445,7 +445,7 @@ class init extends common
'manage' => true,
'users' => true,
'userHistory' => true,
- 'userHistoryExport' => true,
+ 'userReportExport' => true,
'usersAdd' => true,
'userDelete' => false,
'usersDelete' => false,
@@ -543,7 +543,7 @@ class init extends common
'manage' => true,
'users' => true,
'userHistory' => true,
- 'userHistoryExport' => true,
+ 'userReportExport' => true,
'usersAdd' => true,
'userDelete' => true,
'usersDelete' => true,
diff --git a/core/module/user/user.php b/core/module/user/user.php
index 0cc6d30..2954669 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -898,7 +898,7 @@ class user extends common
// Droits spécifiques
'users' => $this->getInput('profilEditCourseUsers', helper::FILTER_BOOLEAN),
'userHistory' => $this->getInput('profilEditCourseUserHistory', helper::FILTER_BOOLEAN),
- 'userHistoryExport' => $this->getInput('profilEditCourseUserHistoryExport', helper::FILTER_BOOLEAN),
+ 'userReportExport' => $this->getInput('profilEditCourseuserReportExport', helper::FILTER_BOOLEAN),
'export' => $this->getInput('profilEditCourseExport', helper::FILTER_BOOLEAN),
'userAdd' => $this->getInput('profilEditCourseUserAdd', helper::FILTER_BOOLEAN),
'usersAdd' => $this->getInput('profilEditCourseUsersAdd', helper::FILTER_BOOLEAN),
@@ -1095,7 +1095,7 @@ class user extends common
// La suite
'users' => $this->getInput('profilAddCourseUsers', helper::FILTER_BOOLEAN),
'userHistory' => $this->getInput('profilAddCourseUserHistory', helper::FILTER_BOOLEAN),
- 'userHistoryExport' => $this->getInput('profilAddCourseUserHistoryExport', helper::FILTER_BOOLEAN),
+ 'userReportExport' => $this->getInput('profilAddCourseuserReportExport', helper::FILTER_BOOLEAN),
'export' => $this->getInput('profilAddCourseExport', helper::FILTER_BOOLEAN),
'userAdd' => $this->getInput('profilAddCourseUserAdd', helper::FILTER_BOOLEAN),
'usersAdd' => $this->getInput('profilAddCourseUsersAdd', helper::FILTER_BOOLEAN),
diff --git a/core/module/user/view/profilAdd/profilAdd.php b/core/module/user/view/profilAdd/profilAdd.php
index cb05e59..ccc6bbd 100644
--- a/core/module/user/view/profilAdd/profilAdd.php
+++ b/core/module/user/view/profilAdd/profilAdd.php
@@ -196,7 +196,7 @@
-
+
diff --git a/core/module/user/view/profilEdit/profilEdit.js.php b/core/module/user/view/profilEdit/profilEdit.js.php
index 0db572e..29a51f5 100644
--- a/core/module/user/view/profilEdit/profilEdit.js.php
+++ b/core/module/user/view/profilEdit/profilEdit.js.php
@@ -56,10 +56,10 @@ $(document).ready(function () {
if ($('#profilEditCourseUsers').is(':checked')) {
// Activer les autres checkboxes
- $('#profilEditCourseUserHistory, #profilEditCourseUserHistoryExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('disabled', false);
+ $('#profilEditCourseUserHistory, #profilEditCourseuserReportExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('disabled', false);
} else {
// Désactiver les autres checkboxes
- $('#profilEditCourseUserHistory, #profilEditCourseUserHistoryExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('checked', false).prop('disabled', true);
+ $('#profilEditCourseUserHistory, #profilEditCourseuserReportExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('checked', false).prop('disabled', true);
// Désactiver les modules et tout décocher
$(".courseContainer").slideUp();
$('.courseContainer input[type="checkbox"]').prop('checked', false);
@@ -135,11 +135,11 @@ $(document).ready(function () {
$('#profilEditCourseUsers').change(function () {
if ($(this).is(':checked')) {
// Activer les autres checkboxes
- $('#profilEditCourseUserHistory, #profilEditCourseUserHistoryExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('disabled', false);
+ $('#profilEditCourseUserHistory, #profilEditCourseuserReportExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('disabled', false);
} else {
// Désactiver les autres checkboxes
- $('#profilEditCourseUserHistory, #profilEditCourseUserHistoryExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('checked', false).prop('disabled', true);
+ $('#profilEditCourseUserHistory, #profilEditCourseuserReportExport, #profilEditCourseUserDelete, #profilEditCourseUsersAdd, #profilEditCourseUsersDelete, #profilEditCourseReset').prop('checked', false).prop('disabled', true);
// Désactiver les modules et tout décocher
$(".courseContainer").slideUp();
$('.courseContainer input[type="checkbox"]').prop('checked', false);
diff --git a/core/module/user/view/profilEdit/profilEdit.php b/core/module/user/view/profilEdit/profilEdit.php
index 99dcebf..cf687f9 100644
--- a/core/module/user/view/profilEdit/profilEdit.php
+++ b/core/module/user/view/profilEdit/profilEdit.php
@@ -291,8 +291,8 @@
]); ?>
- $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'course', 'userHistoryExport']),
+ $this->getData(['profil', $this->getUrl(2), $this->getUrl(3), 'course', 'userReportExport']),
]); ?>