Merge pull request #2173 from bergware/master

Docker and VM: remove path do not exist warning
This commit is contained in:
tom mortensen
2025-04-25 10:12:01 -07:00
committed by GitHub
2 changed files with 6 additions and 10 deletions

View File

@@ -146,11 +146,9 @@ _(Enable Docker)_:
<?=mk_option(_var($dockercfg,'DOCKER_ENABLED'), 'no', _('No'))?>
<?=mk_option(_var($dockercfg,'DOCKER_ENABLED'), 'yes', _('Yes'))?>
</select>
<?if (_var($var,'fsState')!="Started"):?>
<?if (_var($var,'fsState')!="Started"):?>
<span id="arraystopped"><i class="fa fa-warning icon warning"></i> <?=(_var($dockercfg,'DOCKER_ENABLED')=='yes') ? '_(Docker will be available after Array is Started)_' : '_(Apply to activate Docker after Array is Started)_'?></span>
<?elseif (!is_dir(dirname(_var($dockercfg,'DOCKER_IMAGE_FILE'))) || !is_dir(_var($dockercfg,'DOCKER_APP_CONFIG_PATH'))):?>
<span class="basic"><i class="fa fa-warning icon warning"></i> _(One or more paths do not exist)_ (<a href="#" onclick="$('.advancedview').switchButton('option','checked',true); return false">_(view)_</a>)</span>
<?endif;?>
<?endif;?>
:docker_enable_help:

View File

@@ -112,13 +112,11 @@ _(Enable VMs)_:
<?= mk_option($libvirt_service, 'disable', _('No'))?>
<?= mk_option($libvirt_service, 'enable', _('Yes'))?>
</select>
<?if ($hardware):?>
<?if (!$started):?>
<?if ($hardware):?>
<?if (!$started):?>
<span id="arraystopped"><i class="fa fa-warning icon warning"></i> <?=($libvirt_service=='enable')?'_(VMs will be available after Array is Started)_':'_(Apply to activate VMs after Array is Started)_'?></span>
<?elseif (!is_dir(dirname($domain_cfg['IMAGE_FILE'])) || !is_dir($domain_cfg['DOMAINDIR']) || !is_dir($domain_cfg['MEDIADIR'])):?>
<span class="basic" style="display:inline"><i class="fa fa-warning icon warning"></i> _(One or more paths do not exist)_ (<a href="#" onclick="$('.advancedview').switchButton('option','checked',true); return false">_(view)_</a>)</span>
<?endif;?>
<?endif;?>
<?endif;?>
<?endif;?>
:vms_enable_help: