MOBILE-1987 glossary: Check timecreated when getting offline files

Author: crazyserver

www/addons/mod/glossary/controllers/edit.js

@@ -151,11 +151,15 @@ angular.module('mm.addons.mod_glossary')
                 });
             }
         }).then(function(attach) {
-            var cats = $scope.categories.filter(function(category) {
-                return category.selected;
-            }).map(function(category) {
-                return category.id;
-            });
+            var cats = [];
+
+            if ($scope.categories) {
+                cats = $scope.categories.filter(function(category) {
+                    return category.selected;
+                }).map(function(category) {
+                    return category.id;
+                });
+            }
 
             var options = {
                 aliases: $scope.options.aliases || "",
@@ -174,11 +178,11 @@ angular.module('mm.addons.mod_glossary')
                 var promise;
                 if (entry && !allowDuplicateEntries) {
                     // Check if the entry is duplicated in online or offline mode.
-                    promise = $mmaModGlossary.isConceptUsed(glossaryId, concept, entry.timecreated).then(function() {
-                        // There's a entry with same name, reject with error message.
-                        return $mmLang.translateAndReject('mma.mod_glossary.errconceptalreadyexists');
-                    }, function() {
-                        // Not found, entry can be sent.
+                    promise = $mmaModGlossary.isConceptUsed(glossaryId, concept, entry.timecreated).then(function(used) {
+                        if (used) {
+                            // There's a entry with same name, reject with error message.
+                            return $mmLang.translateAndReject('mma.mod_glossary.errconceptalreadyexists');
+                        }
                     });
                 } else {
                     promise = $q.when();
@@ -187,14 +191,14 @@ angular.module('mm.addons.mod_glossary')
                 return promise.then(function() {
                     // Save entry in offline.
                     return $mmaModGlossaryOffline.saveAddEntry(glossaryId, concept, definition, courseId, options, attach,
-                            undefined, undefined, entry).then(function() {
+                            timecreated, undefined, undefined, entry).then(function() {
                         // Don't return anything.
                     });
                 });
             } else {
                 // Try to send it to server.
                 // Don't allow offline if there are attachments since they were uploaded fine.
-                return $mmaModGlossary.addEntry(glossaryId, concept, definition, courseId, options, attach, undefined,
+                return $mmaModGlossary.addEntry(glossaryId, concept, definition, courseId, options, attach, timecreated, undefined,
                     entry, !attachments.length, !allowDuplicateEntries);
             }
         }).then(function(entryId) {

www/addons/mod/glossary/services/glossary.js

@@ -764,14 +764,15 @@ angular.module('mm.addons.mod_glossary')
      * @param  {Number}  courseId          Course ID of the glossary.
      * @param  {Array}   [options]         Array of options for the entry.
      * @param  {Mixed}   [attach]          Attachments ID if sending online, result of $mmFileUploader#storeFilesToUpload otherwise.
+     * @param  {Number}  [timecreated]     The time the entry was created. If not defined, current time.
      * @param  {String}  [siteId]          Site ID. If not defined, current site.
      * @param  {Object}  [discardEntry]    The entry provided will be discarded if found.
      * @param  {Boolean} allowOffline      True if it can be stored in offline, false otherwise.
      * @param  {Boolean} [checkDuplicates] Check for duplicates before storing offline. Only used if allowOffline is true.
      * @return {Promise}          Promise resolved with entry ID if entry was created in server, false if stored in device.
      */
-    self.addEntry = function(glossaryId, concept, definition, courseId, options, attach, siteId, discardEntry, allowOffline,
-            checkDuplicates) {
+    self.addEntry = function(glossaryId, concept, definition, courseId, options, attach, timecreated, siteId, discardEntry,
+            allowOffline, checkDuplicates) {
         siteId = siteId || $mmSite.getId();
 
         if (!$mmApp.isOnline() && allowOffline) {
@@ -800,15 +801,15 @@ angular.module('mm.addons.mod_glossary')
 
         // Convenience function to store a new entry to be synchronized later.
         function storeOffline() {
-            var timecreated = discardEntry && discardEntry.timecreated,
-                duplicatesPromise = checkDuplicates ? self.isConceptUsed(glossaryId, concept, timecreated, siteId) : $q.when(false);
+            var discardTime = discardEntry && discardEntry.timecreated,
+                duplicatesPromise = checkDuplicates ? self.isConceptUsed(glossaryId, concept, discardTime, siteId) : $q.when(false);
             // Check if the entry is duplicated in online or offline mode.
             return duplicatesPromise.then(function(used) {
                 if (used) {
                     return $mmLang.translateAndReject('mma.mod_glossary.errconceptalreadyexists');
                 }
 
-                return $mmaModGlossaryOffline.saveAddEntry(glossaryId, concept, definition, courseId, options, attach,
+                return $mmaModGlossaryOffline.saveAddEntry(glossaryId, concept, definition, courseId, options, attach, timecreated,
                         siteId, undefined, discardEntry).then(function() {
                     return false;
                 });
@@ -909,7 +910,6 @@ angular.module('mm.addons.mod_glossary')
                         return true;
                     }
                 }
-
                 return false;
             });
         }).catch(function() {

www/addons/mod/glossary/services/glossary_offline.js

@@ -170,12 +170,14 @@ angular.module('mm.addons.mod_glossary')
      * @param  {Number} courseId        Course ID of the glossary.
      * @param  {Array}  [options]       Array of options for the entry.
      * @param  {Object} [attach]        Result of $mmFileUploader#storeFilesToUpload for attachments.
+     * @param  {Number} [timecreated]   The time the entry was created. If not defined, current time.
      * @param  {String} [siteId]        Site ID. If not defined, current site.
      * @param  {Number} [userId]        User the entry belong to. If not defined, current user in site.
      * @param  {Object} [discardEntry]  The entry provided will be discarded if found.
      * @return {Promise}                Promise resolved if stored, rejected if failure.
      */
-    self.saveAddEntry = function(glossaryId, concept, definition, courseId, options, attach, siteId, userId, discardEntry) {
+    self.saveAddEntry = function(glossaryId, concept, definition, courseId, options, attach, timecreated, siteId, userId,
+            discardEntry) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
 
@@ -187,7 +189,7 @@ angular.module('mm.addons.mod_glossary')
                     definitionformat: 'html',
                     options: options,
                     userid: userId,
-                    timecreated: new Date().getTime()
+                    timecreated: timecreated || new Date().getTime()
                 };
 
             if (attach) {