- {{ t("An update is available. Click the button below to proceed with the update.") }}
-
+
Current Migration: {{ installerData.checkMigrationStatus.current_migration }}
@@ -63,12 +56,12 @@
-
+
@@ -358,6 +355,7 @@ import Message from "primevue/message"
import Tag from "primevue/tag"
import InputText from "primevue/inputtext"
import Button from "primevue/button"
+import SectionHeader from "../layout/SectionHeader.vue"
const { t } = useI18n()
diff --git a/assets/vue/components/installer/Step3.vue b/assets/vue/components/installer/Step3.vue
index bfb5cea5e1..f9faefde57 100644
--- a/assets/vue/components/installer/Step3.vue
+++ b/assets/vue/components/installer/Step3.vue
@@ -1,9 +1,6 @@
-
+
-
-
-
-
-
+
-
+
-
@@ -511,6 +511,7 @@ import Password from "primevue/password"
import Dropdown from "primevue/dropdown"
import Button from "primevue/button"
import RadioButton from "primevue/radiobutton"
+import SectionHeader from "../layout/SectionHeader.vue"
import languages from "../../utils/languages"
diff --git a/assets/vue/components/installer/Step6.vue b/assets/vue/components/installer/Step6.vue
index bcad509cc1..013757caf4 100644
--- a/assets/vue/components/installer/Step6.vue
+++ b/assets/vue/components/installer/Step6.vue
@@ -3,9 +3,9 @@
v-show="!loading"
class="install-step"
>
-
@@ -60,12 +59,10 @@ import { useI18n } from "vue-i18n"
import Message from "primevue/message"
import Button from "primevue/button"
+import SectionHeader from "../layout/SectionHeader.vue"
+import BaseAppLink from "../basecomponents/BaseAppLink.vue"
const { t } = useI18n()
const installerData = inject("installerData")
-
-function btnFinishOnClick() {
- window.location = "../../"
-}
diff --git a/public/main/install/index.php b/public/main/install/index.php
index 550dd0979c..fd18bc93ad 100644
--- a/public/main/install/index.php
+++ b/public/main/install/index.php
@@ -9,6 +9,7 @@ use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Output\ConsoleOutput;
use Symfony\Component\Dotenv\Dotenv;
use Symfony\Component\ErrorHandler\Debug;
+use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\Session as HttpSession;
use Symfony\Component\Translation\Loader\PoFileLoader;
use Symfony\Component\Translation\Translator;
@@ -71,12 +72,16 @@ Container::$session = new HttpSession();
require_once 'install.lib.php';
$installationLanguage = 'en_US';
-if (!empty($_POST['language_list']) && !ChamiloSession::has('install_language')) {
+$httpRequest = Request::createFromGlobals();
+
+if ($httpRequest->request->get('language_list')) {
$search = ['../', '\\0'];
- $installationLanguage = str_replace($search, '', urldecode($_POST['language_list']));
+ $installationLanguage = str_replace($search, '', urldecode($httpRequest->request->get('language_list')));
ChamiloSession::write('install_language', $installationLanguage);
} elseif (ChamiloSession::has('install_language')) {
$installationLanguage = ChamiloSession::read('install_language');
+} else {
+ $installationLanguage = $httpRequest->getPreferredLanguage();
}
// Set translation
@@ -254,7 +259,7 @@ $total_steps = 7;
$current_step = 1;
if (!$_POST) {
$current_step = 1;
-} elseif (!empty($_POST['language_list']) || !empty($_POST['step1']) || ((!empty($_POST['step2_update_8']) || (!empty($_POST['step2_update_6']))) && ($emptyUpdatePath || $badUpdatePath))) {
+} elseif ($httpRequest->request->get('language_list') || !empty($_POST['step1']) || ((!empty($_POST['step2_update_8']) || (!empty($_POST['step2_update_6']))) && ($emptyUpdatePath || $badUpdatePath))) {
$current_step = 2;
} elseif (!empty($_POST['step2']) || (!empty($_POST['step2_update_8']) || (!empty($_POST['step2_update_6'])))) {
$current_step = 3;
From 0f108f5475fe0f68f9f632a1c48d5f654929b1d5 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <1697880+AngelFQC@users.noreply.github.com>
Date: Mon, 27 Jan 2025 17:15:15 -0500
Subject: [PATCH 15/33] Display: Allow to set the name attribute to BaseButton
component
---
assets/vue/components/basecomponents/BaseButton.vue | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/assets/vue/components/basecomponents/BaseButton.vue b/assets/vue/components/basecomponents/BaseButton.vue
index 0025c22975..7741c8ce62 100644
--- a/assets/vue/components/basecomponents/BaseButton.vue
+++ b/assets/vue/components/basecomponents/BaseButton.vue
@@ -13,6 +13,7 @@
:text="onlyIcon"
:title="tooltip || (onlyIcon ? label : undefined)"
:type="isSubmit ? 'submit' : 'button'"
+ :name="name"
class="cursor-pointer"
@click="$emit('click', $event)"
/>
@@ -70,6 +71,11 @@ const props = defineProps({
type: String,
default: "", // This ensures that popupIdentifier is still present
},
+ name: {
+ type: String || undefined,
+ required: false,
+ default: undefined,
+ },
})
defineEmits(["click"])
From 9225759e2ea938d4fb4f796677aa300411cb903b Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <1697880+AngelFQC@users.noreply.github.com>
Date: Mon, 27 Jan 2025 17:16:33 -0500
Subject: [PATCH 16/33] Display: use defineModel for model value in
BaseDropdown component
---
.../basecomponents/BaseDropdown.vue | 21 +++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/assets/vue/components/basecomponents/BaseDropdown.vue b/assets/vue/components/basecomponents/BaseDropdown.vue
index 894415271c..ac83087840 100644
--- a/assets/vue/components/basecomponents/BaseDropdown.vue
+++ b/assets/vue/components/basecomponents/BaseDropdown.vue
@@ -2,15 +2,14 @@