Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit ad00473

Browse files
author
Michael Grauer
committed
BUG: refs #0282. Commented out display of unimplemented Amazon assetstore type.
1 parent dcfa139 commit ad00473

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

core/controllers/forms/AssetstoreForm.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,9 @@ public function createAssetstoreForm($action = 'assetstore/add')
4545

4646
// Assetstore type
4747
$assetstoretypes = array('0' => $this->t('Managed by MIDAS'),
48-
'1' => $this->t('Remotely linked'),
49-
'2' => $this->t('Amazon S3'));
48+
'1' => $this->t('Remotely linked'));
49+
// Amazon support is not yet implemented, don't present it as an option
50+
// '2' => $this->t('Amazon S3'));
5051

5152
$assetstoretype = new Zend_Form_Element_Select('type', array('id' => 'assetstoretype'));
5253
$assetstoretype->setLabel('Select a type')->setMultiOptions($assetstoretypes);

core/controllers/forms/ImportForm.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public function createImportForm($assetstores)
6161
$assetstoretypes = array();
6262
$assetstoretypes[MIDAS_ASSETSTORE_LOCAL] = $this->t('Copy data on this server'); // manage by MIDAS
6363
$assetstoretypes[MIDAS_ASSETSTORE_REMOTE] = $this->t('Link data from its current location'); // link the data
64-
$assetstoretypes[MIDAS_ASSETSTORE_AMAZON] = $this->t('Copy data to the cloud'); // Amazon support
64+
// Amazon support is not yet implemented, don't present it as an option
65+
//$assetstoretypes[MIDAS_ASSETSTORE_AMAZON] = $this->t('Copy data to the cloud'); // Amazon support
6566

6667
$assetstoretype = new Zend_Form_Element_Select('importassetstoretype');
6768
$assetstoretype->setLabel($this->t('Storage type'));

core/views/admin/index.phtml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,10 @@ $this->headScript()->appendFile($this->coreWebroot . '/public/js/jquery/jquery.c
122122
case MIDAS_ASSETSTORE_REMOTE:
123123
echo "Remote";
124124
break;
125-
case MIDAS_ASSETSTORE_AMAZON:
126-
echo "Amazon S3";
127-
break;
125+
// Amazon support is not yet implemented, don't present it as an option
126+
// case MIDAS_ASSETSTORE_AMAZON:
127+
// echo "Amazon S3";
128+
// break;
128129
default:
129130
echo $assetstore->getType();
130131
break;

0 commit comments

Comments
 (0)