From 188860e0ed2f4633a59c69028691f2456735dd4f Mon Sep 17 00:00:00 2001
From: Ilya Yarkavets <ilya.yarkavets@1pt.com>
Date: Tue, 19 Dec 2017 17:37:47 +0300
Subject: [PATCH 1/2] Now when in configuration file the `ResultServerService`
 class is stated as a default Result Server, the `Result Server` field will be
 hidden from delivery editing form;

---
 models/classes/AbstractResultService.php          | 7 +++++++
 models/classes/ResultServerService.php            | 2 ++
 models/classes/implementation/OntologyService.php | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/models/classes/AbstractResultService.php b/models/classes/AbstractResultService.php
index 7bdc1852..f039130e 100644
--- a/models/classes/AbstractResultService.php
+++ b/models/classes/AbstractResultService.php
@@ -26,6 +26,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
@@ -75,4 +77,9 @@ public function instantiateResultStorage($serviceId)
 
     abstract public function getResultStorage($deliveryId);
 
+    public function isConfigurable()
+    {
+        return $this->configurable;
+    }
+
 }
diff --git a/models/classes/ResultServerService.php b/models/classes/ResultServerService.php
index 75adfadd..15d384e3 100644
--- a/models/classes/ResultServerService.php
+++ b/models/classes/ResultServerService.php
@@ -51,4 +51,6 @@ public function initResultServer($compiledDelivery, $executionIdentifier, $userU
      */
     public function getResultStorage($deliveryId);
 
+    public function isConfigurable();
+
 }
\ No newline at end of file
diff --git a/models/classes/implementation/OntologyService.php b/models/classes/implementation/OntologyService.php
index 5bcc4ad1..332fc0bc 100644
--- a/models/classes/implementation/OntologyService.php
+++ b/models/classes/implementation/OntologyService.php
@@ -36,6 +36,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
      *

From 76f21da13aa9c93368013a255d507f2c8181aa54 Mon Sep 17 00:00:00 2001
From: Ilya Yarkavets <ilya.yarkavets@1pt.com>
Date: Tue, 19 Dec 2017 17:38:47 +0300
Subject: [PATCH 2/2] Version bump;

---
 manifest.php                     | 2 +-
 scripts/update/class.Updater.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.php b/manifest.php
index 6ebd900a..9c0ec0a3 100755
--- 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' => '5.0.0',
+    'version' => '5.0.1',
     'author' => 'Open Assessment Technologies',
     //taoResults may be needed for the taoResults taoResultServerModel that uses taoResults db storage
 	'requires' => array(
diff --git a/scripts/update/class.Updater.php b/scripts/update/class.Updater.php
index eebd0593..5347afc6 100644
--- a/scripts/update/class.Updater.php
+++ b/scripts/update/class.Updater.php
@@ -69,6 +69,6 @@ public function update($initialVersion) {
             $this->setVersion('3.4.0');
         }
 
-        $this->skip('3.4.0', '5.0.0');
+        $this->skip('3.4.0', '5.0.1');
     }
 }