Skip to content

Commit 2e5dd72

Browse files
committed
return errors
1 parent 4e86ebe commit 2e5dd72

File tree

1 file changed

+18
-10
lines changed

1 file changed

+18
-10
lines changed

plugins/data-manager/frontend/public/javascripts/countly.models.js

+18-10
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,10 @@
197197
});
198198
},
199199
saveEvent: function(context, event) {
200-
countlyDataManager.service.saveEvent(event).then(function(err, data) {
201-
console.log(err, data);
200+
countlyDataManager.service.saveEvent(event).then(function(err) {
201+
if (err === 'Error') {
202+
return err;
203+
}
202204
context.dispatch('loadEventsData');
203205
context.dispatch('loadSegmentsMap');
204206
});
@@ -238,11 +240,11 @@
238240
status: event.status,
239241
category: event.category
240242
};
241-
countlyDataManager.service.editEvent(eventMap, omittedSegments).then(function(err, data) {
242-
console.log('err, data');
243-
console.log(err, data);
244-
countlyDataManager.service.editEventMeta(eventMeta).then(function(errMeta, dataMeta) {
245-
console.log(errMeta, dataMeta);
243+
countlyDataManager.service.editEvent(eventMap, omittedSegments).then(function(err) {
244+
countlyDataManager.service.editEventMeta(eventMeta).then(function(errMeta) {
245+
if (err === 'Error' || errMeta === "Error") {
246+
return 'Error';
247+
}
246248
context.dispatch('loadEventsData');
247249
context.dispatch('loadValidations');
248250
context.dispatch('loadSegmentsMap');
@@ -251,23 +253,29 @@
251253
},
252254
omitSegments: function(context, data) {
253255
countlyDataManager.service.editEvent(data.eventMap, data.omittedSegments).then(function(res) {
254-
console.log(res);
256+
if (res === 'Error') {
257+
return res;
258+
}
255259
context.dispatch('loadEventsData');
256260
context.dispatch('loadSegmentsMap');
257261
});
258262
},
259263
changeVisibility: function(context, data) {
260264
var visibility = data.isVisible ? 'show' : 'hide';
261265
countlyDataManager.service.changeVisibility(data.events, visibility).then(function(res) {
262-
console.log(res);
266+
if (res === 'Error') {
267+
return res;
268+
}
263269
context.dispatch('loadEventsData');
264270
context.dispatch('loadSegmentsMap');
265271
});
266272
},
267273
deleteEvents: function(context, events) {
268274
countlyDataManager.service.deleteEvents(events).then(function(res) {
269275
countlyDataManager.service.deleteEventsMeta(events).then(function(res2) {
270-
console.log(res, res2);
276+
if (res === 'Error' || res2 === 'Error') {
277+
return 'Error';
278+
}
271279
context.dispatch('loadEventsData');
272280
context.dispatch('loadSegmentsMap');
273281
});

0 commit comments

Comments
 (0)