#44, Fix creating the tasks on DSM 7.1.1 and 7.2.2

T-REX-XP · Nov 17, 2024 · 330c4dc · 330c4dc
1 parent 1c7872d
commit 330c4dc
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = rr-manager
 SPK_VERS = 2.0
-SPK_REV = 77
+SPK_REV = 78
 SPK_ICON = src/rr-manager.png
 
 DSM_UI_DIR = app

diff --git a/src/src/tabs/main.js b/src/src/tabs/main.js
@@ -245,6 +245,9 @@ export default
                         self.apiProvider.checkRRVersion()
                     ]);
                     self.systemInfo = systemInfo;
+                    var isModernDSM = systemInfo.version_string.includes("7.2.2");
+                    self.apiProvider.setIsModernDSM(isModernDSM);
+
                     self.__checkDownloadFolder(self.__checkRequiredTasks.bind(self));
                     if (systemInfo && packages) {
                         self.rrCheckVersion = rrCheckVersion;

diff --git a/src/src/utils/synoApiProvider.js b/src/src/utils/synoApiProvider.js
@@ -2,8 +2,12 @@ export default
     SYNOCOMMUNITY.RRManager.SynoApiProvider = {
         sendWebAPI: null,
         _prefix: '/webman/3rdparty/rr-manager/scripts/',
-        init: function (sendWebAPI, findAppWindow) {
+        init: function (sendWebAPI, isModernDSM = true) {
             this.sendWebAPI = sendWebAPI;
+            this.isModernDSM = isModernDSM;
+        },
+        setIsModernDSM: function (isModernDSM) {
+            this.isModernDSM = isModernDSM;
         },
         getSytemInfo: function () {
             that = this;
@@ -127,7 +131,7 @@ export default
                 let args = {
                     api: "SYNO.Core.User.PasswordConfirm",
                     method: "auth",
-                    version: 2,
+                    version: self.isModernDSM ? 2 : 1,
                     params: {
                         password: data
                     }, callback: function (success, message) {
@@ -159,7 +163,7 @@ export default
                 }
 
                 let args = {
-                    api: token != "" ? "SYNO.Core.EventScheduler.Root" : "SYNO.Core.EventScheduler",
+                    api: token ? "SYNO.Core.EventScheduler.Root" : "SYNO.Core.EventScheduler",
                     method: "create",
                     version: 1,
                     params: params,