From 77ea548bebfc393c78b45de4d61badc445b01e77 Mon Sep 17 00:00:00 2001 From: Tom Mortensen Date: Fri, 14 Nov 2025 13:22:46 -0800 Subject: [PATCH] Fix: add Disable option to mover schedule --- emhttp/plugins/dynamix/MoverSettings.page | 48 ++++++++++++++--------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/emhttp/plugins/dynamix/MoverSettings.page b/emhttp/plugins/dynamix/MoverSettings.page index 4ca5a060e..e6576111a 100755 --- a/emhttp/plugins/dynamix/MoverSettings.page +++ b/emhttp/plugins/dynamix/MoverSettings.page @@ -15,6 +15,8 @@ Tag="calendar-check-o" */ ?> "._('No Cache device present')."!

"; @@ -23,11 +25,13 @@ if (!$pool_devices) { echo "

"._('User shares not enabled')."!

"; $setup = false; } -$cron = explode(' ',$var['shareMoverSchedule']); -$move = $cron[2]!='*' ? 3 : ($cron[4]!='*' ? 2 : (substr($cron[1],0,1)!='*' ? 1 : 0)); -$mode = ['Hourly','Daily','Weekly','Monthly']; -$days = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday']; - +if (empty($var['shareMoverSchedule'])) { + $cron = explode(' ', "* * * * *"); + $move = 0; +} else { + $cron = explode(' ', $var['shareMoverSchedule']); + $move = $cron[2]!='*' ? 4 : ($cron[4]!='*' ? 3 : (substr($cron[1],0,1)!='*' ? 2 : 1)); +} $showMoverButton = $setup && $pool_devices; $moverRunning = file_exists('/var/run/mover.pid'); ?> @@ -37,27 +41,33 @@ $(function() { presetMover(document.mover_schedule); }); +function presetMover(form) { + var mode = form.shareMoverSchedule.value; + form.min.disabled = mode==0; + form.day.disabled = mode==0 || mode!=3; + form.dotm.disabled = mode==0 || mode!=4; + form.hour1.disabled = mode==0; + form.hour2.disabled = mode==0; + form.day.value = form.day.disabled ? '*' : (form.day.value=='*' ? 0 : form.day.value); + form.dotm.value = form.dotm.disabled ? '*' : (form.dotm.value=='*' ? 1 : form.dotm.value); + if (mode==1) {$('#H1').hide(); $('#H2').show();} else {$('#H2').hide(); $('#H1').show();} +} // Fool Unraid by simulating the original input field function prepareMover(form) { var mode = form.shareMoverSchedule.value; - var min = mode!=0 ? form.min.value : 0; - var hour = mode!=0 ? form.hour1.value : form.hour2.value; - form.shareMoverSchedule.options[mode].value = min+' '+hour+' '+form.dotm.value+' * '+form.day.value; + if (mode == 0) + form.shareMoverSchedule.options[mode].value = ''; + else { + var hour = mode!=1 ? form.hour1.value : form.hour2.value; + var min = mode!=1 ? form.min.value : 0; + form.shareMoverSchedule.options[mode].value = min+' '+hour+' '+form.dotm.value+' * '+form.day.value; + } form.min.disabled = true; form.hour1.disabled = true; form.hour2.disabled = true; form.dotm.disabled = true; form.day.disabled = true; } -function presetMover(form) { - var mode = form.shareMoverSchedule.value; - form.min.disabled = false; - form.day.disabled = mode!=2; - form.dotm.disabled = mode!=3; - form.day.value = form.day.disabled ? '*' : (form.day.value=='*' ? 0 : form.day.value); - form.dotm.value = form.dotm.disabled ? '*' : (form.dotm.value=='*' ? 1 : form.dotm.value); - if (mode==0) {$('#H1').hide(); $('#H2').show();} else {$('#H2').hide(); $('#H1').show();} -}
@@ -92,7 +102,7 @@ _(Day of the month)_: _(Time of the day)_: : - style="display:none"> @@ -102,7 +112,7 @@ _(Time of the day)_:   _(HH:MM)_ - style="display:none">