From c4748c5238027f8b8219b386c2f315c2e4372715 Mon Sep 17 00:00:00 2001
From: Dani Palou
Date: Thu, 20 Jun 2024 16:53:34 +0200
Subject: [PATCH] MOBILE-4612 core: Remove deprecated values yes/no for auto
login
---
.../badges/pages/issued-badge/issued-badge.html | 14 +++++++-------
src/addons/calendar/pages/event/event.html | 2 +-
src/core/components/sites-list/sites-list.html | 2 +-
.../login/pages/email-signup/email-signup.html | 2 +-
.../mainmenu/components/user-menu/user-menu.html | 4 ++--
src/core/features/settings/pages/about/about.html | 8 ++++----
.../settings/pages/deviceinfo/deviceinfo.html | 4 ++--
.../features/settings/pages/licenses/licenses.html | 12 ++++++------
src/core/features/user/pages/about/about.html | 6 +++---
src/core/features/viewer/pages/iframe/iframe.ts | 5 +----
10 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/src/addons/badges/pages/issued-badge/issued-badge.html b/src/addons/badges/pages/issued-badge/issued-badge.html
index 5f06dc1d6..9686be66d 100644
--- a/src/addons/badges/pages/issued-badge/issued-badge.html
+++ b/src/addons/badges/pages/issued-badge/issued-badge.html
@@ -49,7 +49,7 @@
{{ 'addon.badges.contact' | translate}}
-
+
{{ badge.issuercontact }}
@@ -95,7 +95,7 @@
{{ 'addon.badges.imageauthoremail' | translate}}
-
+
{{ badge.imageauthoremail }}
@@ -103,7 +103,7 @@
{{ 'addon.badges.imageauthorurl' | translate}}
- {{ badge.imageauthorurl }}
+ {{ badge.imageauthorurl }}
@@ -166,7 +166,7 @@
{{ 'addon.badges.issueremail' | translate}}
-
+
{{ badge.endorsement.issueremail }}
@@ -175,7 +175,7 @@
{{ 'addon.badges.issuerurl' | translate}}
- {{ badge.endorsement.issuerurl }}
+ {{ badge.endorsement.issuerurl }}
@@ -187,7 +187,7 @@
{{ 'addon.badges.claimid' | translate}}
- {{ badge.endorsement.claimid }}
+ {{ badge.endorsement.claimid }}
@@ -225,7 +225,7 @@
+ [autoLogin]="false">
{{ alignment.targetname }}
diff --git a/src/addons/calendar/pages/event/event.html b/src/addons/calendar/pages/event/event.html
index 6f21e79ef..b7f1ff8e4 100644
--- a/src/addons/calendar/pages/event/event.html
+++ b/src/addons/calendar/pages/event/event.html
@@ -104,7 +104,7 @@
{{ 'core.location' | translate}}
-
+
diff --git a/src/core/components/sites-list/sites-list.html b/src/core/components/sites-list/sites-list.html
index 429820659..890c48764 100644
--- a/src/core/components/sites-list/sites-list.html
+++ b/src/core/components/sites-list/sites-list.html
@@ -27,7 +27,7 @@
-
+
{{ site.siteUrlWithoutProtocol }}
diff --git a/src/core/features/login/pages/email-signup/email-signup.html b/src/core/features/login/pages/email-signup/email-signup.html
index 51c27f859..ff8eb087e 100644
--- a/src/core/features/login/pages/email-signup/email-signup.html
+++ b/src/core/features/login/pages/email-signup/email-signup.html
@@ -27,7 +27,7 @@
{{ 'core.login.signuprequiredfieldnotsupported' | translate }}
-
+
{{ 'core.openinbrowser' | translate }}
diff --git a/src/core/features/mainmenu/components/user-menu/user-menu.html b/src/core/features/mainmenu/components/user-menu/user-menu.html
index 6dc40ca15..7063eba8e 100644
--- a/src/core/features/mainmenu/components/user-menu/user-menu.html
+++ b/src/core/features/mainmenu/components/user-menu/user-menu.html
@@ -17,7 +17,7 @@
-
+
diff --git a/src/core/features/settings/pages/about/about.html b/src/core/features/settings/pages/about/about.html
index ce17902b3..83002f367 100644
--- a/src/core/features/settings/pages/about/about.html
+++ b/src/core/features/settings/pages/about/about.html
@@ -17,12 +17,12 @@
{{ 'core.settings.opensourcelicenses' | translate }}
-
{{ 'core.settings.privacypolicy' | translate }}
-
{{ 'core.settings.accessstatement' | translate }}
@@ -32,8 +32,8 @@
{{ 'core.settings.helpusimprove' | translate }}
-
+
{{ 'core.settings.legaldisclaimer' | translate }}
diff --git a/src/core/features/settings/pages/deviceinfo/deviceinfo.html b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
index 08886bdc5..1eedc62d5 100644
--- a/src/core/features/settings/pages/deviceinfo/deviceinfo.html
+++ b/src/core/features/settings/pages/deviceinfo/deviceinfo.html
@@ -42,7 +42,7 @@
{{ 'core.settings.siteinfo' | translate }}
*
- {{ deviceInfo.siteUrl }}
+ {{ deviceInfo.siteUrl }}
{{ deviceInfo.siteVersion }}
{{ deviceInfo.siteId }}
@@ -51,7 +51,7 @@
{{ 'core.settings.filesystemroot' | translate }}
-
+
{{ deviceInfo.fileSystemRoot }}
diff --git a/src/core/features/settings/pages/licenses/licenses.html b/src/core/features/settings/pages/licenses/licenses.html
index 7710faa0f..eacf71709 100644
--- a/src/core/features/settings/pages/licenses/licenses.html
+++ b/src/core/features/settings/pages/licenses/licenses.html
@@ -14,30 +14,30 @@
-
+
{{ 'core.settings.opensourcelicenses' | translate }}
-
+
{{ 'core.view' | translate }}
- {{ license.name }}
+ {{ license.name }}
{{ license.name }} - {{ license.version }}
{{ 'core.settings.publisher' | translate }}{{ 'core.labelsep' | translate }} {{ license.publisher }}
{{ 'core.settings.license' | translate }}{{ 'core.labelsep' | translate }} {{ license.licenses }}
- {{ license.url }}
- {{ license.url }}
+ {{ license.email }}
+ [autoLogin]="false" [ariaLabel]="'core.view' | translate">
diff --git a/src/core/features/user/pages/about/about.html b/src/core/features/user/pages/about/about.html
index f068fdc3e..7d7d43007 100644
--- a/src/core/features/user/pages/about/about.html
+++ b/src/core/features/user/pages/about/about.html
@@ -44,7 +44,7 @@
{{ 'core.user.email' | translate }}
-
+
{{ user.email }}
@@ -70,7 +70,7 @@
{{ 'core.user.phone1' | translate}}
-
+
{{ user.phone1 }}
@@ -78,7 +78,7 @@
{{ 'core.user.phone2' | translate}}
-
+
{{ user.phone2 }}
diff --git a/src/core/features/viewer/pages/iframe/iframe.ts b/src/core/features/viewer/pages/iframe/iframe.ts
index 5b6ef0d13..ed468be0b 100644
--- a/src/core/features/viewer/pages/iframe/iframe.ts
+++ b/src/core/features/viewer/pages/iframe/iframe.ts
@@ -31,10 +31,7 @@ export class CoreViewerIframePage implements OnInit {
async ngOnInit(): Promise {
this.title = CoreNavigator.getRouteParam('title');
this.url = CoreNavigator.getRouteParam('url');
- const autoLoginParam = CoreNavigator.getRouteParam('autoLogin') ?? true;
- this.autoLogin = typeof autoLoginParam === 'boolean' ?
- autoLoginParam :
- autoLoginParam !== 'no'; // Support deprecated values yes/no/check.
+ this.autoLogin = CoreNavigator.getRouteBooleanParam('autoLogin') ?? true;
}
}