mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-03-13 14:30:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Multi cache support

Browse Source
This commit is contained in:
bergware
2020-03-23 17:38:59 +01:00
parent 7451ae2655
commit 4a75f317ac
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/dynamix/CacheDevices.page
View File

@@ -40,7 +40,7 @@ function addPoolPopup() {
_(Add)_: function() {
var poolname = $(this).find('input[name="poolName"]').val();
var valid = /^[a-z_][a-z0-9_-]*[a-z_]$/;
var reserved = ['disk','disks','diskp','diskq','diskr','flash','parity','parity2'];
var reserved = ['disk','data','disks','diskp','diskq','diskr','flash','parity','parity2'];
if (reserved.includes(poolname)) {
swal({title:'_(Invalid pool name)_',text:'_(Do not use reserved names)_',type:'error',confirmButtonText:'_(Ok)_'});
} else if (!valid.test(poolname)) {

23
plugins/dynamix/NewConfig.page
View File

@@ -32,16 +32,16 @@ span.indent{display:inline-block;width:240px;margin-top:30px;}
<script>
function prepareNewConfig(form) {
for (var i=1,item; item=form.preset.options[i]; i++) {
switch (item.value) {
case 'parity': if (item.selected) form.preserveParity.disabled = false; break;
case 'data' : if (item.selected) form.preserveData.disabled = false; break;
<?foreach ($pools as $pool):?>
case '<?=$pool?>': if (item.selected) form.preserve<?=ucfirst($pool)?>.disabled = false; break;
<?endforeach;?>
var preserve = [];
for (var i=1,item; item=form.preserveSlots.options[i]; i++) {
if (item.selected) {
preserve.push(item.value);
item.selected = false;
}
}
form.preset.disabled = true;
item = form.preserveSlots.options[0];
item.value = preserve.join(',');
item.selected = true;
}
$(function() {
$('#s1').dropdownchecklist({emptyText:'_(None)_', width:<?=$width[0]?>, firstItemChecksAll:true, explicitClose:'..._(close)_'});
@@ -66,14 +66,9 @@ effect of making it ***impossible*** to rebuild an existing failed drive - you h
<hr>
<form name="newConfig" method="POST" action="/update.htm" target="progressFrame" onsubmit="prepareNewConfig(this)">
<input type="hidden" name="preserveParity" value="yes" disabled>
<input type="hidden" name="preserveData" value="yes" disabled>
<?foreach ($pools as $pool):?>
<input type="hidden" name="preserve<?=ucfirst($pool)?>" value="yes" disabled>
<?endforeach;?>
<span class="indent">_(Preserve current assignments)_:</span>
<select id="s1" name="preset" multiple="multiple" style="display:none">
<select id="s1" name="preserveSlots" multiple="multiple" style="display:none">
<option value=''>_(All)_</option>
<?=mk_option_check(0,'parity',_('Parity slots'))?>
<?=mk_option_check(0,'data',_('Data slots'))?>