EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3512 from dpalou/MOBILE-4081 

MOBILE-4081 database: Fix entry.id is undefined after change group
main
Alfonso Salces 2022-12-16 10:31:38 +01:00 committed by GitHub
parent 8983ecd173 38c43984f0
commit b49aa35503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?> <?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> <name>Moodle</name>
<description>Moodle official app</description> <description>Moodle official app</description>
<author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author> <author email="mobile@moodle.com" href="http://moodle.com">Moodle Mobile team</author>
@ -27,7 +27,7 @@
<preference name="UIWebViewBounce" value="false" /> <preference name="UIWebViewBounce" value="false" />
<preference name="DisallowOverscroll" value="true" /> <preference name="DisallowOverscroll" value="true" />
<preference name="prerendered-icon" 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="BackupWebStorage" value="none" />
<preference name="ScrollEnabled" value="false" /> <preference name="ScrollEnabled" value="false" />
<preference name="KeyboardDisplayRequiresUserAction" value="false" /> <preference name="KeyboardDisplayRequiresUserAction" value="false" />

4
moodle.config.json
View File

@ -1,8 +1,8 @@
{ {
"app_id": "com.moodle.moodlemobile", "app_id": "com.moodle.moodlemobile",
"appname": "Moodle Mobile", "appname": "Moodle Mobile",
"versioncode": 41000, "versioncode": 41001,
"versionname": "4.1.0-dev", "versionname": "4.1.0",
"cache_update_frequency_usually": 420000, "cache_update_frequency_usually": 420000,
"cache_update_frequency_often": 1200000, "cache_update_frequency_often": 1200000,
"cache_update_frequency_sometimes": 3600000, "cache_update_frequency_sometimes": 3600000,

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "moodlemobile", "name": "moodlemobile",
"version": "4.1.0-dev", "version": "4.1.0",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "moodlemobile", "name": "moodlemobile",
"version": "4.1.0-dev", "version": "4.1.0",
"description": "The official app for Moodle.", "description": "The official app for Moodle.",
"author": { "author": {
"name": "Moodle Pty Ltd.", "name": "Moodle Pty Ltd.",

1
src/addons/mod/data/pages/entry/entry.ts
View File

@ -352,6 +352,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy {
if (this.offset === undefined) { if (this.offset === undefined) {
// No offset passed, display the first entry. // No offset passed, display the first entry.
pageIndex = 0; pageIndex = 0;
this.offset = 0;
} else if (this.offset > 0) { } else if (this.offset > 0) {
// Online entry. // Online entry.
pageIndex = this.offset % perPage + (entries.offlineEntries?.length || 0); pageIndex = this.offset % perPage + (entries.offlineEntries?.length || 0);

7
src/addons/mod/forum/tests/behat/basic_usage.feature
View File

@ -329,4 +329,9 @@ Feature: Test basic usage of forum activity in app
When I press the back button in the 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 descending order" in the app
And I press "Sort by last post creation date in ascending 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

2
src/addons/mod/forum/tests/behat/groups.feature
View File

@ -366,4 +366,4 @@ Feature: Test usage of forum activity with groups in app
When I press "Visible groups" in the app When I press "Visible groups" in the app
And I press "Group 1" 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