Merge branch 'release-3.8.0'

oat-sa · May 18, 2018 · be16a49 · be16a49
2 parents 3099f25 + c8735c3
commit be16a49
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/manifest.php b/manifest.php
@@ -33,10 +33,10 @@
     'label' => 'Test-taker core extension',
 	'description' => 'TAO TestTaker extension',
     'license' => 'GPL-2.0',
-    'version' => '3.7.1',
+    'version' => '3.8.0',
 	'author' => 'Open Assessment Technologies, CRP Henri Tudor',
 	'requires' => array(
-	    'tao' => '>=17.14.0',
+	    'tao' => '>=19.0.0',
 	    'taoBackOffice' => '>=1.3.0'
     ),
 	'models' => array(

diff --git a/models/TestTakerImporter.php b/models/TestTakerImporter.php
@@ -62,6 +62,7 @@ class TestTakerImporter extends RdsUserImportService
     public function import($filePath, $extraProperties = [], $options = [])
     {
         $extraProperties[UserRdf::PROPERTY_ROLES] = TaoRoles::DELIVERY;
+        $extraProperties['roles'] = TaoRoles::DELIVERY;
         return parent::import($filePath, $extraProperties, $options);
     }
 

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -83,6 +83,6 @@ public function update($initialVersion)
 
             $this->setVersion('3.7.0');
         }
-        $this->skip('3.7.0', '3.7.1');
+        $this->skip('3.7.0', '3.8.0');
     }
 }