Merge branch 'release-6.1.0'

manifest.php

@@ -33,13 +33,13 @@
     'label' => 'Groups core extension',
     'description' => 'TAO Groups extension',
     'license' => 'GPL-2.0',
-    'version' => '6.0.1',
+    'version' => '6.1.0',
     'author' => 'Open Assessment Technologies, CRP Henri Tudor',
     'requires' => array(
         'taoTestTaker' => '>=4.0.0',
         'taoBackOffice' => '>=3.0.0',
         'generis' => '>=5.11.0',
-        'tao' => '>=34.0.0'
+        'tao' => '>=36.1.0'
     ),
 	'models' => array(
 		'http://www.tao.lu/Ontologies/TAOGroup.rdf'

models/update/Updater.php

@@ -77,6 +77,6 @@ public function update($initialVersion)
             $this->setVersion('3.0.1');
         }
 
-        $this->skip('3.0.1','6.0.1');
+        $this->skip('3.0.1','6.1.0');
     }
 }

views/build/grunt/bundle.js

@@ -13,12 +13,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2014-2018 (original work) Open Assessment Technologies SA;
+ * Copyright (c) 2014-2019 (original work) Open Assessment Technologies SA;
  */
 
 /**
  * configure the extension bundles
  * @author Bertrand Chevrier <[email protected]>
+ *
+ * @param {Object} grunt - the grunt object (by convention)
  */
 module.exports = function(grunt) {
     'use strict';
@@ -31,7 +33,8 @@ module.exports = function(grunt) {
                     outputDir : 'loader',
                     bundles : [{
                         name : 'taoGroups',
-                        default : true
+                        default : true,
+                        babel : true
                     }]
                 }
             }

views/js/provider/group.js

@@ -13,7 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2017  (original work) Open Assessment Technologies SA;
+ * Copyright (c) 2017-2019  (original work) Open Assessment Technologies SA;
  *
  * @author Alexander Zagovorichev <[email protected]>
  */
@@ -44,17 +44,17 @@ define(['jquery', 'lodash', 'i18n', 'util/url', 'core/promise', 'core/request'],
              * @param {String} [config.type] - Type of the instance
              * @return {*}
              */
-            addInstance: function addInstance (config) {
+            addInstance (config) {
 
-                var _defaults = {
+                const _defaults = {
                     classUri: 'http_2_www_0_tao_0_lu_1_Ontologies_1_TAOGroup_0_rdf_3_Group',
                     id: 'http://www.tao.lu/Ontologies/TAOGroup.rdf#Group',
                     type: 'instance'
                 };
 
                 config = _.defaults(config || {}, _defaults);
 
-                return new Promise(function(resolve, reject){
+                return new Promise((resolve, reject) => {
                         coreRequest({
                             url: urlUtil.route('addInstance', 'Groups', 'taoGroups'),
                             method: 'POST',
@@ -76,9 +76,9 @@ define(['jquery', 'lodash', 'i18n', 'util/url', 'core/promise', 'core/request'],
              * @param uri
              * @return {*}
              */
-            deleteGroup: function deleteGroup (uri) {
+            deleteGroup (uri) {
 
-                return new Promise(function(resolve, reject) {
+                return new Promise((resolve, reject) => {
 
                     if (!_.isString(uri) || _.isEmpty(uri)) {
                         return reject(new TypeError(__('Group uri is not valid')));