Изменения документа AdminGroupsSheet

Сводка

• Свойства страницы (1 изменено, 0 добавлено, 0 удалено)
• Объекты (1 изменено, 0 добавлено, 0 удалено)
  • XWiki.JavaScriptExtension[0]

Подробности

Свойства страницы

Автор документа

...	...	@@ -1,1 +1,1 @@
1		-XWiki.admin
	1	+XWiki.rybakovds

XWiki.JavaScriptExtension[0]

Код

...	...	@@ -51,12 +51,12 @@
51	51	groupNameTimeout = setTimeout(function() {
52	52	var groupName = groupNameInput.val();
53	53	var groupURL = new XWiki.Document(groupName, 'XWiki').getRestURL();
54		- $.get(groupURL).done(function() {
	54	+ $.get(groupURL).then(() => {
55	55	// A document with the specified name already exists.
56	56	var message = $jsontool.serialize($services.localization.render('rightsmanager.groupexist'))
57	57	.replace('__name__', groupName);
58	58	validation.setError(groupNameInput, message);
59		- }).fail(function(response) {
	59	+ }).catch(response => {
60	60	if (response.status === 404) {
61	61	// The document does not exist, so we can use it.
62	62	validation.setSuccess(groupNameInput);
...	...	@@ -72,7 +72,7 @@
72	72	}
73	73	});
74	74
75		- createGroupModal.submit(function(event) {
	75	+ createGroupModal.on('submit', function(event) {
76	76	event.preventDefault();
77	77	var data = createGroupModal.find('form').serializeArray();
78	78	data.push({name: 'ajax', value: 1});
...	...	@@ -84,7 +84,7 @@
84	84	$jsontool.serialize($services.localization.render('xe.admin.groups.create.inProgress')),
85	85	'inprogress'
86	86	);
87		- $.post(createGroupURL, data).done(function() {
	87	+ Promise.resolve($.post(createGroupURL, data)).then(function() {
88	88	// Close the modal and refresh the groups live table.
89	89	createGroupModal.modal('hide');
90	90	window.livetable_groupstable.refresh();
...	...	@@ -92,12 +92,12 @@
92	92	$jsontool.serialize($services.localization.render('xe.admin.groups.create.done')),
93	93	'done'
94	94	));
95		- }).fail(function() {
	95	+ }).catch(function() {
96	96	notification.replace(new XWiki.widgets.Notification(
97	97	$jsontool.serialize($services.localization.render('xe.admin.groups.create.failed')),
98	98	'error'
99	99	));
100		- }).always(function() {
	100	+ }).finally(function() {
101	101	// Re-enable the form.
102	102	createGroupModal.find(':input').prop('disabled', false);
103	103	});
...	...	@@ -161,8 +161,8 @@
161	161	var groupDocument = new XWiki.Document(groupReference);
162	162	var editGroupURL = groupDocument.getURL('edit', 'xpage=plain');
163	163	editGroupModal.find('.modal-body').empty().addClass('loading').load(editGroupURL, function() {
164		- this.removeClass('loading');
165		- $(document).trigger('xwiki:dom:updated', {'elements': this.toArray()});
	164	+ $(this).removeClass('loading');
	165	+ $(document).trigger('xwiki:dom:updated', {'elements': $(this).toArray()});
166	166	});
167	167	}).on('hide.bs.modal', function() {
168	168	editGroupModal.data('liveTable').refresh();
...	...	@@ -180,7 +180,7 @@
180	180	groupReference = XWiki.Model.serialize(groupReference);
181	181	}
182	182	deleteGroupModal.find('.groupName').text(groupReference);
183		- }).find('.btn-danger').click(function() {
	183	+ }).find('.btn-danger').on('click', function() {
184	184	var notification = new XWiki.widgets.Notification(
185	185	$jsontool.serialize($services.localization.render('xe.admin.groups.delete.inProgress')),
186	186	'inprogress'
...	...	@@ -189,13 +189,13 @@
189	189	xpage: 'deleteuorg',
190	190	docname: deleteGroupModal.find('.groupName').text(),
191	191	form_token: xm.form_token
192		- }).done(function() {
	192	+ }).then(() => {
193	193	deleteGroupModal.data('liveTable').deleteRow(deleteGroupModal.data('rowIndex'));
194	194	notification.replace(new XWiki.widgets.Notification(
195	195	$jsontool.serialize($services.localization.render('xe.admin.groups.delete.done')),
196	196	'done'
197	197	));
198		- }).fail(function() {
	198	+ }).catch(() => {
199	199	notification.replace(new XWiki.widgets.Notification(
200	200	$jsontool.serialize($services.localization.render('xe.admin.groups.delete.failed')),
201	201	'error'