Merge pull request #3512 from dpalou/MOBILE-4081

MOBILE-4081 database: Fix entry.id is undefined after change group

Author: alfonso-salces

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="41000" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.1.0.0" version="4.1.0-dev" versionCode="41000" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-versionCode="41001" id="com.moodle.moodlemobile" ios-CFBundleVersion="4.1.0.1" version="4.1.0" versionCode="41001" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>Moodle</name>
     <description>Moodle official app</description>
     <author email="[email protected]" href="http://moodle.com">Moodle Mobile team</author>
@@ -27,7 +27,7 @@
     <preference name="UIWebViewBounce" value="false" />
     <preference name="DisallowOverscroll" value="true" />
     <preference name="prerendered-icon" value="true" />
-    <preference name="AppendUserAgent" value="MoodleMobile 4.1.0-dev (41000)" />
+    <preference name="AppendUserAgent" value="MoodleMobile 4.1.0 (41001)" />
     <preference name="BackupWebStorage" value="none" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="KeyboardDisplayRequiresUserAction" value="false" />

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,

package-lock.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.",

package.json

@@ -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);

src/addons/mod/data/pages/entry/entry.ts

@@ -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

src/addons/mod/forum/tests/behat/basic_usage.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