Merge branch 'release-6.1.0'

oat-sa · Feb 9, 2018 · 7e11651 · 7e11651
2 parents da09b14 + 1f1c9b8
commit 7e11651
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/manifest.php b/manifest.php
@@ -13,7 +13,7 @@
     'label' => 'Result core extension',
     'description' => 'Results Server management and exposed interfaces for results data submission',
     'license' => 'GPL-2.0',
-    'version' => '6.0.1',
+    'version' => '6.1.0',
     'author' => 'Open Assessment Technologies',
     //taoResults may be needed for the taoResults taoResultServerModel that uses taoResults db storage
 	'requires' => array(

diff --git a/models/classes/AbstractResultService.php b/models/classes/AbstractResultService.php
@@ -27,6 +27,8 @@
 
 abstract class AbstractResultService extends ConfigurableService implements ResultServerService
 {
+    /** @var bool $configurable Whether this ResultServerService instance is configurable */
+    protected $configurable = true;
 
     /**
      * Starts or resume a taoResultServerStateFull session for results submission
@@ -76,9 +78,11 @@ public function instantiateResultStorage($serviceId)
 
     abstract public function getResultStorage($deliveryId);
 
-    /**
-     * @inheritdoc
-     */
+    public function isConfigurable()
+    {
+        return $this->configurable;
+    }
+
     public function deleteDeliveryExecutionData(DeliveryExecutionDeleteRequest $request)
     {
         $storage = $this->getResultStorage($request->getDeliveryResource()->getUri());

diff --git a/models/classes/ResultServerService.php b/models/classes/ResultServerService.php
@@ -53,4 +53,6 @@ public function initResultServer($compiledDelivery, $executionIdentifier, $userU
      */
     public function getResultStorage($deliveryId);
 
+    public function isConfigurable();
+
 }
diff --git a/models/classes/implementation/OntologyService.php b/models/classes/implementation/OntologyService.php
@@ -35,6 +35,9 @@ class OntologyService extends AbstractResultService
     /** @deprecated */
     const PROPERTY_RESULT_SERVER = 'http://www.tao.lu/Ontologies/TAODelivery.rdf#DeliveryResultServer';
 
+    /** @var bool $configurable Whether this ResultServerService instance is configurable */
+    protected $configurable = false;
+
     /**
      * Returns the storage engine of the result server
      *

diff --git a/scripts/update/class.Updater.php b/scripts/update/class.Updater.php
@@ -77,6 +77,6 @@ public function update($initialVersion) {
             $this->setVersion('5.1.0');
         }
 
-        $this->skip('5.1.0', '6.0.1');
+        $this->skip('5.1.0', '6.1.0');
     }
 }