Commit 538ce6d4 by Andy Armstrong Committed by cahrens

Fix merge problem

parent 436d7739
define([ define([
'js/views/baseview', 'underscore', 'jquery', 'gettext', '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'; 'use strict';
var GroupConfigurationEdit = BaseView.extend({ var GroupConfigurationEdit = BaseView.extend({
tagName: 'div', tagName: 'div',
...@@ -112,7 +112,7 @@ function(BaseView, _, $, gettext, GroupEdit) { ...@@ -112,7 +112,7 @@ function(BaseView, _, $, gettext, GroupEdit) {
return false; return false;
} }
this.runOperationShowingMessage( ViewUtils.runOperationShowingMessage(
gettext('Saving') + '…', gettext('Saving') + '…',
function () { function () {
var dfd = $.Deferred(); var dfd = $.Deferred();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment