MOBILE-2178 database: Fix database prefetch

Author: dpalou

www/addons/mod/data/controllers/index.js

@@ -66,7 +66,6 @@ angular.module('mm.addons.mod_data')
             $scope.description = data.intro || $scope.description;
             $scope.data = databaseData;
 
-            $scope.database = data;
             if (sync) {
                 // Try to synchronize the database.
                 return syncDatabase(showErrors).catch(function() {

www/addons/mod/data/services/prefetch_handler.js

@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @name $mmaModDataPrefetchHandler
  */
 .factory('$mmaModDataPrefetchHandler', function($mmaModData, mmaModDataComponent, $mmFilepool, $q, $mmUtil, $mmPrefetchFactory,
-        $mmSite, $mmGroups, $mmCourse) {
+        $mmSite, $mmGroups, $mmCourse, $mmComments) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModDataComponent);
 
@@ -130,7 +130,7 @@ angular.module('mm.addons.mod_data')
         var promises = [];
 
         angular.forEach(groups, function(group) {
-            promises.push($mmaModData.fetchAllEntries(dataId, group.id, undefined, undefined, undefined, undefined, forceCache,
+            promises.push($mmaModData.fetchAllEntries(dataId, group.id, undefined, undefined, undefined, forceCache,
                 ignoreCache, siteId));
         });
 
@@ -319,7 +319,7 @@ angular.module('mm.addons.mod_data')
         siteId = siteId || $mmSite.getId();
 
         // Prefetch the database data.
-        return getDatabaseInfoHelper(module, courseId, false, true, siteId).then(function(info) {
+        return getDatabaseInfoHelper(module, courseId, false, false, true, siteId).then(function(info) {
             var database = info.database,
                 promises = [];
 

www/core/components/course/services/prefetchfactory.js

@@ -278,7 +278,7 @@ angular.module('mm.core.course')
                 }
 
                 if (module.description) {
-                    return $q.when($mmUtil.extractDownloadableFilesFromHtmlAsFakeFileObjects(module.description));
+                    return $mmUtil.extractDownloadableFilesFromHtmlAsFakeFileObjects(module.description);
                 }
 
                 return [];