From 1391f45213be8b770dbc74e08bf776adf3ff9eb2 Mon Sep 17 00:00:00 2001
From: bergware <bergware@users.noreply.github.com>
Date: Tue, 11 May 2021 05:49:00 +0200
Subject: [PATCH] Fix regression in Update OS display

---
 plugins/dynamix.plugin.manager/Update.page | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/plugins/dynamix.plugin.manager/Update.page b/plugins/dynamix.plugin.manager/Update.page
index 14d76e869..abc2cc1c5 100644
--- a/plugins/dynamix.plugin.manager/Update.page
+++ b/plugins/dynamix.plugin.manager/Update.page
@@ -31,6 +31,7 @@ if (file_exists('/boot/previous/changes.txt')) {
   }
   $branch = strpos($version,'rc')!==false ? _('Next') : (strpos($version,'beta')!==false ? _('Beta') : _('Stable'));
 }
+$reboot = preg_match("/^\*\*(REBOOT REQUIRED|DOWNGRADE)/",@file_get_contents("$docroot/plugins/unRAIDServer/README.md",false,null,0,20));
 ?>
 <style>
 input[value="_(Install)_"],input[value="_(Update)_"],input[value="_(Restore)_"]{margin:0}
@@ -68,15 +69,15 @@ function updateInfo(data) {
 function initlist() {
   $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{init:true,system:true,check:<?=$check?>},function(data) {
     $('#os_list').html(data);
-<?if (preg_match("/^\*\*(REBOOT REQUIRED|DOWNGRADE)/",@file_get_contents("$docroot/plugins/unRAIDServer/README.md",false,null,0,20))):?>
-    $('#change_branch').prop('disabled',true);
-<?endif;?>
 <?if ($bzroot):?>
     $('#previous').show();
 <?endif;?>
     loadlist();
   });
 }
+function warning (data) {
+  return data.replace('green','orange').replace("<?=_('up-to-date')?>","<?=_('Reboot')?>").replace('check','warning');
+}
 function loadlist(id,check) {
   $.get('/plugins/dynamix.plugin.manager/include/ShowPlugins.php',{system:true,audit:id,check:check||<?=$check?>},function(data) {
     var list = $('#os_list');
@@ -84,15 +85,22 @@ function loadlist(id,check) {
       var cmd = id.split(':');
       var tr = 'tr#'+cmd[0].replace(/[\. _]/g,'');
       switch (cmd[1]) {
-        case 'update' : data = data.replace('green','orange').replace("<?=_('up-to-date')?>","<?=_('Reboot')?>").replace('check','warning');
+        case 'update' : data = warning(data);
         case 'return' : updateInfo(data); break;
-        case 'install': list.find(tr).remove(); list.append(data.replace('green','orange').replace("<?=_('up-to-date')?>","<?=_('Reboot')?>").replace('check','warning')); break;
+        case 'install': list.find(tr).remove(); list.append(warning(data)); break;
       }
     } else {
+<?if (!$reboot):?>
       updateInfo(data);
+<?else:?>
+      updateInfo(warning(data));
+<?endif;?>
     }
     $('#os_table').trigger('update');
     $('#checkos').prop('disabled',false);
+<?if ($reboot):?>
+    $('#change_branch').prop('disabled',true);
+<?endif;?>
   });
 }
 $(function() {