From 2afa7918b14a42b058856c705ac90cc6347e7fd1 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Thu, 15 Dec 2022 17:06:28 +0100 Subject: [PATCH 1/3] MOBILE-4081 database: Fix entry.id is undefined after change group --- src/addons/mod/data/pages/entry/entry.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts index 470f97f7a..cb6d43cfe 100644 --- a/src/addons/mod/data/pages/entry/entry.ts +++ b/src/addons/mod/data/pages/entry/entry.ts @@ -352,6 +352,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy { if (this.offset === undefined) { // No offset passed, display the first entry. pageIndex = 0; + this.offset = 0; } else if (this.offset > 0) { // Online entry. pageIndex = this.offset % perPage + (entries.offlineEntries?.length || 0); From 82082eb14aca2b28d483ad1818b9d5e55f4daa32 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 16 Dec 2022 08:36:54 +0100 Subject: [PATCH 2/3] MOBILE-4081 forum: Fix prefetch behat test --- src/addons/mod/forum/tests/behat/basic_usage.feature | 7 ++++++- src/addons/mod/forum/tests/behat/groups.feature | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/addons/mod/forum/tests/behat/basic_usage.feature b/src/addons/mod/forum/tests/behat/basic_usage.feature index eb5750689..7f7035095 100755 --- a/src/addons/mod/forum/tests/behat/basic_usage.feature +++ b/src/addons/mod/forum/tests/behat/basic_usage.feature @@ -329,4 +329,9 @@ Feature: Test basic usage of forum activity in app When I press the back button in the app And I press "Sort by last post creation date in descending order" in the app And I press "Sort by last post creation date in ascending order" in the app - Then I should find "There was a problem connecting to the site. Please check your connection and try again." in the app + Then I should find "Forum not available in this sorting order" in the app + + When I press the back button in the app + And I press "Test forum name" in the app + Then I should find "Forum not available in this sorting order" in the app + And I should find "Sort by last post creation date in ascending order" in the app diff --git a/src/addons/mod/forum/tests/behat/groups.feature b/src/addons/mod/forum/tests/behat/groups.feature index 1d10056eb..b542c22c0 100755 --- a/src/addons/mod/forum/tests/behat/groups.feature +++ b/src/addons/mod/forum/tests/behat/groups.feature @@ -366,4 +366,4 @@ Feature: Test usage of forum activity with groups in app When I press "Visible groups" in the app And I press "Group 1" in the app - Then I should find "There was a problem connecting to the site. Please check your connection and try again." in the app + Then I should find "Forum not available in this sorting order" in the app From 38c43984f054a54a9212b67f377062894d4483ab Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Fri, 16 Dec 2022 10:13:33 +0100 Subject: [PATCH 3/3] MOBILE-4081 config: Set versions for 4.1.0 release --- config.xml | 4 ++-- moodle.config.json | 4 ++-- package-lock.json | 2 +- package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config.xml b/config.xml index ae353eb0d..a97ad98de 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Moodle Moodle official app Moodle Mobile team @@ -27,7 +27,7 @@ - + diff --git a/moodle.config.json b/moodle.config.json index d345c5ec3..103c210ea 100644 --- a/moodle.config.json +++ b/moodle.config.json @@ -1,8 +1,8 @@ { "app_id": "com.moodle.moodlemobile", "appname": "Moodle Mobile", - "versioncode": 41000, - "versionname": "4.1.0-dev", + "versioncode": 41001, + "versionname": "4.1.0", "cache_update_frequency_usually": 420000, "cache_update_frequency_often": 1200000, "cache_update_frequency_sometimes": 3600000, diff --git a/package-lock.json b/package-lock.json index e1ab5d454..9a020e161 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "moodlemobile", - "version": "4.1.0-dev", + "version": "4.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 76d188d59..e359872da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "moodlemobile", - "version": "4.1.0-dev", + "version": "4.1.0", "description": "The official app for Moodle.", "author": { "name": "Moodle Pty Ltd.",