From a17a88b58f344cefe1b79f1b920b303cfb970069 Mon Sep 17 00:00:00 2001 From: jsconan Date: Fri, 12 Aug 2016 11:32:04 +0200 Subject: [PATCH 1/2] Fix version --- manifest.php | 2 +- scripts/update/Updater.php | 42 +++++++++++++++++++------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/manifest.php b/manifest.php index ada0006677..ecf766807d 100755 --- a/manifest.php +++ b/manifest.php @@ -33,7 +33,7 @@ 'label' => 'QTI test model', 'description' => 'TAO QTI test implementation', 'license' => 'GPL-2.0', - 'version' => '5.5.0', + 'version' => '5.4.0', 'author' => 'Open Assessment Technologies', 'requires' => array( 'taoTests' => '>=3.0.0', diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php index 704d55cbd1..043649dcc0 100644 --- a/scripts/update/Updater.php +++ b/scripts/update/Updater.php @@ -35,16 +35,16 @@ * @author Jean-S�bastien Conan */ class Updater extends \common_ext_ExtensionUpdater { - + /** - * + * * @param string $initialVersion * @return string $versionUpdatedTo */ public function update($initialVersion) { $currentVersion = $initialVersion; - + // add testrunner config if ($currentVersion == '2.6') { @@ -59,7 +59,7 @@ public function update($initialVersion) { $currentVersion = '2.6.1'; } - + if ($currentVersion == '2.6.1') { $config = \common_ext_ExtensionsManager::singleton()->getExtensionById('taoQtiTest')->getConfig('testRunner'); $config['exitButton'] = false; @@ -67,7 +67,7 @@ public function update($initialVersion) { $currentVersion = '2.6.2'; } - + // add testrunner review screen config if ($currentVersion == '2.6.2') { $extension = \common_ext_ExtensionsManager::singleton()->getExtensionById('taoQtiTest'); @@ -81,7 +81,7 @@ public function update($initialVersion) { $currentVersion = '2.6.3'; } - + // adjust testrunner config if ($currentVersion == '2.6.3') { $defaultConfig = array( @@ -118,13 +118,13 @@ public function update($initialVersion) { // add markForReview button if ($currentVersion === '2.7.0') { $registry = TestRunnerClientConfigRegistry::getRegistry(); - + $registry->registerQtiTools('markForReview', array( 'label' => 'Mark for review', 'icon' => 'anchor', 'hook' => 'taoQtiTest/testRunner/actionBar/markForReview' )); - + $currentVersion = '2.8.0'; } @@ -143,7 +143,7 @@ public function update($initialVersion) { // adjust testrunner config: set the "can collapse" option if ($currentVersion == '2.9.0') { $registry = TestRunnerClientConfigRegistry::getRegistry(); - + $registry->registerQtiTools('collapseReview', array( 'title' => 'Show/Hide the review screen', 'label' => 'Review', @@ -184,7 +184,7 @@ public function update($initialVersion) { $currentVersion = '2.12.0'; } - + // update the test taker review action buttons if ($currentVersion == '2.12.0') { $registry = TestRunnerClientConfigRegistry::getRegistry(); @@ -217,7 +217,7 @@ public function update($initialVersion) { $currentVersion = '2.14.0'; } - + if ($currentVersion === '2.14.0') { try { $this->getServiceManager()->get('taoQtiTest/SessionStateService'); @@ -239,7 +239,7 @@ public function update($initialVersion) { $currentVersion = '2.16.0'; } - + $this->setVersion($currentVersion); if ($this->isBetween('2.16.0','2.17.0')) { @@ -255,12 +255,12 @@ public function update($initialVersion) { $this->getServiceManager()->register(QtiRunnerService::CONFIG_ID, $service); } - + $this->setVersion('2.17.0'); } - + $this->skip('2.17.0','2.19.1'); - + if ($this->isVersion('2.19.1')) { // sets default plugin options $extension = \common_ext_ExtensionsManager::singleton()->getExtensionById('taoQtiTest'); @@ -293,7 +293,7 @@ public function update($initialVersion) { $this->setVersion('2.23.0'); } - + $this->skip('2.23.0','2.24.0'); if ($this->isVersion('2.24.0')) { @@ -325,7 +325,7 @@ public function update($initialVersion) { $this->setVersion('2.26.0'); } - + $this->skip('2.26.0', '2.27.0'); if ($this->isVersion('2.27.0')) { @@ -427,10 +427,10 @@ public function update($initialVersion) { 'params' => [] ], ]); - + $extension->setConfig('testRunner', $config); } - + $this->setVersion('2.31.1'); } @@ -518,9 +518,9 @@ public function update($initialVersion) { $this->setVersion('5.0.0'); } - $this->skip('5.0.0', '5.3.0'); + $this->skip('5.0.0', '5.4.0'); - if ($this->isVersion('5.3.0')) { + if ($this->isVersion('5.4.0')) { $extension = \common_ext_ExtensionsManager::singleton()->getExtensionById('taoQtiTest'); $config = $extension->getConfig('testRunner'); From d9d318293a3fe8536076d18ef60098253e2d437d Mon Sep 17 00:00:00 2001 From: jsconan Date: Fri, 12 Aug 2016 11:33:23 +0200 Subject: [PATCH 2/2] Fix version --- manifest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.php b/manifest.php index ecf766807d..ada0006677 100755 --- a/manifest.php +++ b/manifest.php @@ -33,7 +33,7 @@ 'label' => 'QTI test model', 'description' => 'TAO QTI test implementation', 'license' => 'GPL-2.0', - 'version' => '5.4.0', + 'version' => '5.5.0', 'author' => 'Open Assessment Technologies', 'requires' => array( 'taoTests' => '>=3.0.0',