mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-22 10:08:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

CPU pinning: hanlde dots in VM names

Browse Source
This commit is contained in:
bergware
2018-09-11 03:32:36 +02:00
parent 723fdf5ab5
commit cd6fb7a519
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/CPUvms.page
+6 -5
View File
@@ -50,7 +50,8 @@ input.flat{margin:0}
input.lock{margin:0}
</style>
<script>
String.prototype.stripper = function(){return this.replace(/ |\(|\)|\[|\]/g,'');}
String.prototype.strip = function(){return this.replace(/ |\(|\)|\[|\]/g,'');}
String.prototype.encode = function(){return this.replace(/\./g,'%2e');}
function apply(form) {
// disable buttons
@@ -61,10 +62,10 @@ function apply(form) {
var id = $(form).prop('name');
var args = {};
args['id'] = id;
args['names'] = form.names.value;
args['names'] = form.names.value.encode();
// get the 'checked' cpus
$(form).find('input[type=checkbox]').each(function(){
if ($(this).prop('checked')) args[$(this).prop('name')] = 'on';
if ($(this).prop('checked')) args[$(this).prop('name').encode()] = 'on';
});
// show the instant wait message
$('#wait-'+id).show();
@@ -80,7 +81,7 @@ function apply(form) {
wait = data.length;
for (var i=0; i < data.length; i++) {
var name = data[i];
$('#'+id+'-'+name.stripper()).show('slow');
$('#'+id+'-'+name.strip()).show('slow');
// step 2: apply the changes by updating the vm or container
$.post('/webGui/include/UpdateTwo.php',{id:id,name:encodeURI(name)},function(reply){
if (reply.error) {
@@ -91,7 +92,7 @@ function apply(form) {
reset($('form[name="'+id+'"]'));
});
} else {
$('#'+id+'-'+reply.success.stripper()).hide('slow');
$('#'+id+'-'+reply.success.strip()).hide('slow');
// cleanup when all is done
if (!--wait) {
setTimeout(function(){$('#wait-'+id).hide();},500);
plugins/dynamix/include/UpdateOne.php
+6 -2
View File
@@ -11,14 +11,18 @@
*/
?>
<?
function decode($data) {
return str_replace('%2e','.',urldecode($data));
}
$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
$map = $changes = [];
foreach (array_map('urldecode',explode(';',$_POST['names'])) as $name) $map[$name] = '';
foreach (array_map('decode',explode(';',$_POST['names'])) as $name) $map[$name] = '';
foreach($_POST as $key => $val) {
if ($val != 'on') continue;
list($name,$cpu) = explode(':',$key);
$map[urldecode($name)] .= "$cpu,";
$map[decode($name)] .= "$cpu,";
}
// map holds the list of each vm, container or isolcpus and its newly proposed cpu assignments
$map = array_map(function($d){return substr($d,0,-1);},$map);