Merge pull request #3837 from dpalou/MOBILE-4362

Mobile 4362

src/addons/mod/glossary/services/glossary.ts

@@ -291,16 +291,16 @@ export class AddonModGlossaryProvider {
         glossaryId: number,
         options: AddonModGlossaryGetEntriesOptions = {},
     ): Promise<AddonModGlossaryGetEntriesWSResponse> {
-        options.from = options.from || 0;
-        options.limit = options.limit || AddonModGlossaryProvider.LIMIT_ENTRIES;
+        const from = options.from || 0;
+        const limit = options.limit || AddonModGlossaryProvider.LIMIT_ENTRIES;
 
         const site = await CoreSites.getSite(options.siteId);
 
         const params: AddonModGlossaryGetEntriesByLetterWSParams = {
             id: glossaryId,
             letter: 'ALL',
-            from: options.from,
-            limit: options.limit,
+            from,
+            limit,
         };
         const preSets: CoreSiteWSPreSets = {
             cacheKey: this.getEntriesByLetterCacheKey(glossaryId),
@@ -316,9 +316,9 @@ export class AddonModGlossaryProvider {
             preSets,
         );
 
-        if (options.limit == AddonModGlossaryProvider.LIMIT_ENTRIES) {
+        if (limit === AddonModGlossaryProvider.LIMIT_ENTRIES) {
             // Store entries in background, don't block the user for this.
-            CoreUtils.ignoreErrors(this.storeEntries(glossaryId, result.entries, options.from, site.getId()));
+            CoreUtils.ignoreErrors(this.storeEntries(glossaryId, result.entries, from, site.getId()));
         }
 
         return result;
@@ -446,13 +446,13 @@ export class AddonModGlossaryProvider {
         site: CoreSite,
         options: AddonModGlossaryGetCategoriesOptions = {},
     ): Promise<AddonModGlossaryCategory[]> {
-        options.from = options.from || 0;
-        options.limit = options.limit || AddonModGlossaryProvider.LIMIT_CATEGORIES;
+        const from = options.from || 0;
+        const limit = options.limit || AddonModGlossaryProvider.LIMIT_CATEGORIES;
 
         const params: AddonModGlossaryGetCategoriesWSParams = {
             id: glossaryId,
-            from: options.from,
-            limit: options.limit,
+            from,
+            limit,
         };
         const preSets: CoreSiteWSPreSets = {
             cacheKey: this.getCategoriesCacheKey(glossaryId),
@@ -465,11 +465,12 @@ export class AddonModGlossaryProvider {
         const response = await site.read<AddonModGlossaryGetCategoriesWSResponse>('mod_glossary_get_categories', params, preSets);
 
         categories = categories.concat(response.categories);
-        const canLoadMore = (options.from + options.limit) < response.count;
+        const canLoadMore = (from + limit) < response.count;
         if (canLoadMore) {
-            options.from += options.limit;
-
-            return this.getCategories(glossaryId, categories, site, options);
+            return this.getCategories(glossaryId, categories, site, {
+                ...options,
+                from: from + limit,
+            });
         }
 
         return categories;

src/addons/mod/workshop/services/workshop.ts

@@ -1100,23 +1100,25 @@ export class AddonModWorkshopProvider {
             const args: string[] = field.name.split('_');
             const name = args[0];
             const idx = args[3];
-            const idy = args[6] || false;
+            const idy = args[6];
+            const idxNumber = parseInt(args[3], 10);
+            const idyNumber = parseInt(args[6], 10);
 
-            if (parseInt(idx, 10) + '' == idx) {
+            if (!isNaN(idxNumber)) {
                 if (!parsedFields[idx]) {
                     parsedFields[idx] = {
-                        number: idx + 1, // eslint-disable-line id-blacklist
+                        number: idxNumber + 1, // eslint-disable-line id-blacklist
                     };
                 }
 
-                if (idy && parseInt(idy, 10) + '' == idy) {
+                if (!isNaN(idyNumber)) {
                     if (!parsedFields[idx].fields) {
                         parsedFields[idx].fields = [];
                     }
 
                     if (!parsedFields[idx].fields[idy]) {
                         parsedFields[idx].fields[idy] = {
-                            number: idy + 1, // eslint-disable-line id-blacklist
+                            number: idyNumber + 1, // eslint-disable-line id-blacklist
                         };
                     }
                     parsedFields[idx].fields[idy][name] = field.value;

src/addons/mod/workshop/tests/behat/basic_usage.feature

@@ -83,7 +83,7 @@ Feature: Test basic usage of workshop activity in app
     Then I should find "Task to do" within "Assess peers" "ion-item" in the app
 
     When I press "The Answer" in the app
-    And I press "Grade for Aspect 01" in the app
+    And I press "Grade for Aspect 1" in the app
     And I press "10 / 10" in the app
     And I press "Save" in the app
     Then I should find "Assessed submission" in the app