Merge branch 'next' into anna/next

Author: Cookiezaurs

api/utils/taskmanager.js

@@ -607,6 +607,7 @@ taskmanager.checkResult = function(options, callback) {
 * @param {funciton} callback - callback for the result
 */
 taskmanager.checkIfRunning = function(options, callback) {
+    options = options || {};
     options.db = options.db || common.db;
     var query = {};
     if (options.id) {
@@ -982,6 +983,7 @@ taskmanager.rerunTask = function(options, callback) {
                 reqData = {};
             }
             if (reqData.uri) {
+                reqData.json = reqData.json || {};
                 reqData.json.task_id = options.id;
                 reqData.strictSSL = false;
                 if (reqData.json && reqData.json.period && Array.isArray(reqData.json.period)) {

frontend/express/public/core/events/javascripts/countly.details.models.js

@@ -449,9 +449,9 @@
             return res[context.state.selectedEventName].data;
         },
         getAllEventsList: function(eventsList, groupList) {
-            var map = eventsList.map || {};
             var allEvents = [];
             if (eventsList && eventsList.list) {
+                var map = eventsList.map || {};
                 eventsList.list.forEach(function(item) {
                     if (!map[item] || (map[item] && (map[item].is_visible || map[item].is_visible === undefined))) {
                         var label;