From 538ce6d478dd810eb017157897b99cf9dccb259b Mon Sep 17 00:00:00 2001 From: Andy Armstrong Date: Tue, 15 Jul 2014 14:47:44 -0400 Subject: [PATCH] Fix merge problem --- cms/static/js/views/group_configuration_edit.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/static/js/views/group_configuration_edit.js b/cms/static/js/views/group_configuration_edit.js index 900457915f..8ffc5613d9 100644 --- a/cms/static/js/views/group_configuration_edit.js +++ b/cms/static/js/views/group_configuration_edit.js @@ -1,8 +1,8 @@ define([ 'js/views/baseview', 'underscore', 'jquery', 'gettext', - 'js/views/group_edit' + 'js/views/group_edit', 'js/views/utils/view_utils' ], -function(BaseView, _, $, gettext, GroupEdit) { +function(BaseView, _, $, gettext, GroupEdit, ViewUtils) { 'use strict'; var GroupConfigurationEdit = BaseView.extend({ tagName: 'div', @@ -112,7 +112,7 @@ function(BaseView, _, $, gettext, GroupEdit) { return false; } - this.runOperationShowingMessage( + ViewUtils.runOperationShowingMessage( gettext('Saving') + '…', function () { var dfd = $.Deferred();