Merge pull request #4422 from Countly/SER-786

[SER-786] Report manager export table issue
Countly · Aug 2, 2023 · f5e0c05 · f5e0c05
2 parents ad2d42f + ef1b30c
commit f5e0c05
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/frontend/express/public/core/report-manager/javascripts/countly.views.js b/frontend/express/public/core/report-manager/javascripts/countly.views.js
@@ -1,4 +1,4 @@
-/*global app, countlyVue, CV, Vue, countlyGlobal, countlyCommon, moment, CountlyHelpers, countlyTaskManager */
+/*global app, countlyVue, CV, Vue, countlyGlobal, countlyCommon, moment, CountlyHelpers, countlyTaskManager, countlyAuth */
 
 (function() {
 
@@ -395,8 +395,7 @@
                 }
             },
             getExportAPI: function() {
-                var requestPath = '/o/tasks/list?api_key=' + countlyGlobal.member.api_key +
-                    "&app_id=" + countlyCommon.ACTIVE_APP_ID + '&iDisplayStart=0&iDisplayLength=10000',
+                var requestPath = '/o/tasks/list?api_key=' + countlyGlobal.member.api_key + '&iDisplayStart=0&iDisplayLength=10000',
                     self = this;
 
                 if (this.lastRequestPayload) {
@@ -565,8 +564,12 @@
             component: ReportManagerView,
         });
     };
-
     app.route("/manage/tasks", "manageJobs", function() {
-        this.renderWhenReady(getMainView());
+        if (countlyAuth.validateRead("reports")) {
+            this.renderWhenReady(getMainView());
+        }
+        else {
+            app.navigate("/", true);
+        }
     });
 })();
diff --git a/frontend/express/public/javascripts/countly/countly.template.js b/frontend/express/public/javascripts/countly/countly.template.js
@@ -1159,9 +1159,9 @@ var AppRouter = Backbone.Router.extend({
             }
         });
 
-        // if (countlyAuth.validateRead('core')) {
-        //     self.addSubMenu("management", {code: "longtasks", url: "#/manage/tasks", text: "sidebar.management.longtasks", priority: 10});
-        // }
+        if (countlyAuth.validateRead('core')) {
+            self.addSubMenu("management", {code: "longtasks", url: "#/manage/tasks", text: "sidebar.management.longtasks", priority: 10});
+        }
 
         //management is also a menu category which goes in default menu i.e. visible to all users