Merge branch 'MDL-75883-master' of https://github.com/dravek/moodle
This commit is contained in:
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -25,7 +25,6 @@
|
||||
|
||||
import $ from 'jquery';
|
||||
import CustomEvents from 'core/custom_interaction_events';
|
||||
import {dispatchEvent} from 'core/event_dispatcher';
|
||||
import 'core/inplace_editable';
|
||||
import Notification from 'core/notification';
|
||||
import Pending from 'core/pending';
|
||||
@@ -34,7 +33,6 @@ import SortableList from 'core/sortable_list';
|
||||
import {get_string as getString} from 'core/str';
|
||||
import Templates from 'core/templates';
|
||||
import {add as addToast} from 'core/toast';
|
||||
import * as reportEvents from 'core_reportbuilder/local/events';
|
||||
import * as reportSelectors from 'core_reportbuilder/local/selectors';
|
||||
import {addFilter, deleteFilter, reorderFilter} from 'core_reportbuilder/local/repository/filters';
|
||||
|
||||
@@ -139,10 +137,7 @@ export const init = initialized => {
|
||||
return deleteFilter(reportElement.dataset.reportId, filterContainer.dataset.filterId)
|
||||
.then(data => reloadSettingsFiltersRegion(reportElement, data))
|
||||
.then(() => addToast(getString('filterdeleted', 'core_reportbuilder', filterName)))
|
||||
.then(() => {
|
||||
dispatchEvent(reportEvents.tableReload, {}, reportElement);
|
||||
return pendingPromise.resolve();
|
||||
})
|
||||
.then(() => pendingPromise.resolve())
|
||||
.catch(Notification.exception);
|
||||
}).catch(() => {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user