diff --git a/src/app/rr-manager.js b/src/app/rr-manager.js index 4e28296..ba891ae 100644 --- a/src/app/rr-manager.js +++ b/src/app/rr-manager.js @@ -500,8 +500,8 @@ Ext.define("SYNOCOMMUNITY.RRManager.Overview.Main", { style: 'margin: 10px; overflow-y: auto; border: 1px solid #ccc; padding: 5px;', height: '75%', // Fixed height for the scrollable area anchor: '100%' - } - ] + } + ] }); window.open(); }, @@ -546,9 +546,11 @@ Ext.define("SYNOCOMMUNITY.RRManager.Overview.Main", { url: [self.rrCheckVersion.updateAllUrl] }); } - if (self?.rrCheckVersion?.status == "update available" && self?.rrCheckVersion?.tag !="null") { - self.showPrompt('Update Available', - `The new version ${self.rrCheckVersion.tag} of RR is available. Do you want to download it?`, self.rrCheckVersion.notes, donwloadUpdate); + if (self?.rrCheckVersion?.status == "update available" + && self?.rrCheckVersion?.tag != "null" + && self.rrConfig.rr_version !== self?.rrCheckVersion?.tag) { + self.showPrompt(self._T('ui', 'prompt_update_available_title'), + self.formatString(self._T('ui', 'prompt_update_available_message'), self.rrCheckVersion.tag), self.rrCheckVersion.notes, donwloadUpdate); } })(); self.__checkDownloadFolder(self.__checkRequiredTasks.bind(self)); @@ -614,8 +616,7 @@ Ext.define("SYNOCOMMUNITY.RRManager.Overview.Main", { let countUpdatesStatusAttemp = 0; const updateStatusInterval = setInterval(async function () { - debugger; - const checksStatusResponse = await self.callCustomScript('checkUpdateStatus.cgi'); //rr_update_progress + const checksStatusResponse = await self.callCustomScript('checkUpdateStatus.cgi'); if (!checksStatusResponse?.success) { clearInterval(updateStatusInterval); self.owner.getEl()?.unmask(); diff --git a/src/app/texts/enu/strings b/src/app/texts/enu/strings index 0d5e93b..5c67d46 100644 --- a/src/app/texts/enu/strings +++ b/src/app/texts/enu/strings @@ -59,6 +59,10 @@ col_name="Name" col_description="Description" +prompt_update_available_title='Update Available' +prompt_update_available_message="The new version {0} of RR is available. Do you want to download it?" + + [widget] danger_status="Danger!" danger_status_message="Your RR is not working properly."