Merge pull request #934 from crazyserver/MOBILE-1987

jleyva · web-flow · commit 59f8e58a4cd1 · 2017-02-23T15:25:57.000+01:00
Mobile 1987
diff --git a/www/addons/mod/folder/templates/index.html b/www/addons/mod/folder/templates/index.html
@@ -9,7 +9,7 @@
             <mm-context-menu-item priority="500" ng-if="size" content="size" icon-description="'ion-cube'" icon-action="'ion-trash-a'" action="removeFiles()"></mm-context-menu-item>
         </mm-context-menu>
     </ion-nav-buttons>
-    <ion-content padding="true" mm-state-class>
+    <ion-content mm-state-class>
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="canReload" on-refresh="refreshFolder()"></ion-refresher>
         <mm-loading hide-until="folderLoaded">
             <mm-course-mod-description description="description" component="{{component}}" component-id="{{componentId}}" watch="true"></mm-course-mod-description>
@@ -22,7 +22,7 @@
                     </a>
                 </li>
             </ul>
-            <div ng-if="!contents || contents.length == 0">
+            <div class="padding" ng-if="!contents || contents.length == 0">
                 <p>{{ 'mma.mod_folder.emptyfilelist' | translate}}</p>
             </div>
         </mm-loading>
diff --git a/www/addons/mod/glossary/controllers/edit.js b/www/addons/mod/glossary/controllers/edit.js
@@ -142,7 +142,7 @@ angular.module('mm.addons.mod_glossary')
             attachments = $scope.attachments;
 
             // Upload attachments first if any.
-            if (attachments.length) {
+            if (!!attachments.length) {
                 return $mmaModGlossaryHelper.uploadOrStoreFiles(glossaryId, concept, timecreated, attachments, false)
                         .catch(function() {
                     // Cannot upload them in online, save them in offline.
@@ -174,7 +174,7 @@ 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).then(function() {
+                    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() {
@@ -195,7 +195,7 @@ angular.module('mm.addons.mod_glossary')
                 // 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,
-                    entry, !attachments.length);
+                    entry, !attachments.length, !allowDuplicateEntries);
             }
         }).then(function(entryId) {
             if (entryId) {
diff --git a/www/addons/mod/glossary/services/glossary.js b/www/addons/mod/glossary/services/glossary.js
@@ -758,18 +758,20 @@ angular.module('mm.addons.mod_glossary')
      * @module mm.addons.mod_glossary
      * @ngdoc method
      * @name $mmaModGlossary#addEntry
-     * @param  {Number}  glossaryId     Glossary ID.
-     * @param  {String}  concept        Glossary entry concept.
-     * @param  {String}  definition     Glossary entry concept definition.
-     * @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  {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  {Number}  glossaryId        Glossary ID.
+     * @param  {String}  concept           Glossary entry concept.
+     * @param  {String}  definition        Glossary entry concept definition.
+     * @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  {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) {
+    self.addEntry = function(glossaryId, concept, definition, courseId, options, attach, siteId, discardEntry, allowOffline,
+            checkDuplicates) {
         siteId = siteId || $mmSite.getId();
 
         if (!$mmApp.isOnline() && allowOffline) {
@@ -798,8 +800,10 @@ 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);
             // Check if the entry is duplicated in online or offline mode.
-            return self.isConceptUsed(glossaryId, concept, siteId).then(function(used) {
+            return duplicatesPromise.then(function(used) {
                 if (used) {
                     return $mmLang.translateAndReject('mma.mod_glossary.errconceptalreadyexists');
                 }
@@ -882,14 +886,15 @@ angular.module('mm.addons.mod_glossary')
      * @module mm.addons.mod_glossary
      * @ngdoc method
      * @name $mmaModGlossary#isConceptUsed
-     * @param  {Number} glossaryId  Glossary ID.
-     * @param  {String} concept     Concept to check.
-     * @param  {String} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise}            Promise resolved with true if used, resolved with false if not used or error.
+     * @param  {Number} glossaryId      Glossary ID.
+     * @param  {String} concept         Concept to check.
+     * @param  {Number} [timecreated]   Timecreated to check that is not the timecreated we are editing.
+     * @param  {String} [siteId]        Site ID. If not defined, current site.
+     * @return {Promise}                Promise resolved with true if used, resolved with false if not used or error.
      */
-    self.isConceptUsed = function(glossaryId, concept, siteId) {
+    self.isConceptUsed = function(glossaryId, concept, timecreated, siteId) {
         // Check offline first.
-        return $mmaModGlossaryOffline.isConceptUsed(glossaryId, concept, siteId).then(function(exists) {
+        return $mmaModGlossaryOffline.isConceptUsed(glossaryId, concept, timecreated, siteId).then(function(exists) {
             if (exists) {
                 return true;
             }
diff --git a/www/addons/mod/glossary/services/glossary_offline.js b/www/addons/mod/glossary/services/glossary_offline.js
@@ -52,7 +52,7 @@ angular.module('mm.addons.mod_glossary')
  * @ngdoc service
  * @name $mmaModGlossaryOffline
  */
-.factory('$mmaModGlossaryOffline', function($mmSitesManager, $log, mmaModGlossaryAddEntryStore, $mmFS, $q) {
+.factory('$mmaModGlossaryOffline', function($mmSitesManager, $log, mmaModGlossaryAddEntryStore, $mmFS, $q, $mmUtil) {
     $log = $log.getInstance('$mmaModGlossaryOffline');
 
     var self = {};
@@ -132,16 +132,24 @@ angular.module('mm.addons.mod_glossary')
      * @module mm.addons.mod_glossary
      * @ngdoc method
      * @name $mmaModGlossaryOffline#isConceptUsed
-     * @param  {Number} glossaryId Glossary ID.
-     * @param  {String} concept    Concept to check.
-     * @param  {String} [siteId]   Site ID. If not defined, current site.
-     * @return {Promise}           Promise resolved with true if concept is found, false otherwise.
+     * @param  {Number} glossaryId      Glossary ID.
+     * @param  {String} concept         Concept to check.
+     * @param  {Number} [timecreated]   Timecreated to check that is not the timecreated we are editing.
+     * @param  {String} [siteId]        Site ID. If not defined, current site.
+     * @return {Promise}                Promise resolved with true if concept is found, false otherwise.
      */
-    self.isConceptUsed = function(glossaryId, concept, siteId) {
+    self.isConceptUsed = function(glossaryId, concept, timecreated, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return site.getDb().whereEqual(mmaModGlossaryAddEntryStore, 'glossaryAndConcept', [glossaryId, concept])
                     .then(function(entries) {
-                return !!entries.length;
+                if (!!entries.length) {
+                    if (entries.length > 1 || !timecreated) {
+                        return true;
+                    }
+                    // If there's only one entry, check that is not the one we are editing.
+                    return $mmUtil.promiseFails(self.getAddEntry(glossaryId, concept, timecreated, siteId));
+                }
+                return false;
             });
         }).catch(function() {
             // No offline data found, return false.
diff --git a/www/core/components/login/controllers/site.js b/www/core/components/login/controllers/site.js
@@ -88,7 +88,8 @@ angular.module('mm.core.login')
         $scope.issue = issue;
         var popup = $ionicPopup.show({
             templateUrl:  'core/components/login/templates/login-issue.html',
-            scope: $scope
+            scope: $scope,
+            cssClass: 'mm-nohead mm-bigpopup'
         });
 
         $scope.closePopup = function() {
diff --git a/www/core/directives/file.js b/www/core/directives/file.js
@@ -233,7 +233,7 @@ angular.module('mm.core')
                     });
                 } else {
                     // File doesn't need to be opened (it's a prefetch). Show confirm modal if file size is defined and it's big.
-                    promise = fileSize ? $mmUtil.confirmDownloadSize(fileSize) : $q.when();
+                    promise = fileSize ? $mmUtil.confirmDownloadSize({size: fileSize, total: true}) : $q.when();
                     promise.then(function() {
                         // User confirmed, add the file to queue.
                         $mmFilepool.invalidateFileByUrl(siteId, fileUrl).finally(function() {
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
@@ -773,6 +773,9 @@ angular.module('mm.core')
 
             options.template = addFormatTextIfNeeded(template); // Add format-text to handle links.
             options.title = title;
+            if (!title) {
+                options.cssClass = 'mm-nohead';
+            }
             return $ionicPopup.confirm(options).then(function(confirmed) {
                 if (!confirmed) {
                     return $q.reject();
@@ -1200,6 +1203,40 @@ angular.module('mm.core')
             return deferred.promise;
         };
 
+        /**
+         * Check if a promise works and returns true if resolves or false if rejects.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmUtil#promiseWorks
+         * @param  {Promise} promise    Promise to check
+         * @return {Promise}            Promise resolved with true if the promises resolves and false if rejects.
+         */
+        self.promiseWorks = function(promise) {
+            return promise.then(function() {
+                return true;
+            }).catch(function() {
+                return false;
+            });
+        };
+
+        /**
+         * Check if a promise works and returns true if rejects or false if resolves.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmUtil#promiseFails
+         * @param  {Promise} promise    Promise to check
+         * @return {Promise}            Promise resolved with true if the promises rejects and false if resolves.
+         */
+        self.promiseFails = function(promise) {
+            return promise.then(function() {
+                return false;
+            }).catch(function() {
+                return true;
+            });
+        };
+
         /**
          * Compare two objects. This function won't compare functions and proto properties, it's a basic compare.
          * Also, this will only check if itemA's properties are in itemB with same value. This function will still
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
@@ -688,6 +688,17 @@ mm-timer {
 
 .popover.mm-context-menu {
   width: 320px;
+  max-width: 100%;
+}
+
+.popup-container.mm-nohead .popup-head {
+  display: none;
+}
+
+.popup-container.mm-bigpopup .popup {
+  width: 90%; // Fallback of calc.
+  width: calc(100% - 20px);
+  max-width: none;
 }
 
 // Inline icons and inputs.
