Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-05 04:46:03 +01:00
Code Issues Packages Projects Releases Activity

Fixed issue where Adding a new page and canceling from within Editing would alter the Parent location of the edited page (fixes #2067)

Browse Source
This commit is contained in:
Djamil Legato
2021-03-22 17:12:37 -07:00
parent e14e72958f
commit c61d91c7a8
3 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -1,3 +1,9 @@
# v1.10.9
## mm/dd/2021
1. [](#bugfix)
* Fixed issue where Adding a new page and canceling from within Editing would alter the Parent location of the edited page [#2067](https://github.com/getgrav/grav-plugin-admin/issues/2067)
# v1.10.8 # v1.10.8
## 03/19/2021 ## 03/19/2021

20
themes/grav/app/forms/fields/parents.js
View File

@@ -198,6 +198,7 @@ $(document).on('click', '[data-parents]', (event) => {
const target = $(event.currentTarget); const target = $(event.currentTarget);
let field = target.closest('.parents-wrapper').find('input[name]'); let field = target.closest('.parents-wrapper').find('input[name]');
let fieldName = field.attr('name'); let fieldName = field.attr('name');
let selectedField = null;
if (!field.length) { if (!field.length) {
fieldName = target.data('parents'); fieldName = target.data('parents');
@@ -235,7 +236,7 @@ $(document).on('click', '[data-parents]', (event) => {
} }
modal.data('parents', Instances[`${fieldName}-${modal.data('remodalId')}`]); modal.data('parents', Instances[`${fieldName}-${modal.data('remodalId')}`]);
modal.data('parents-selectedField', field);
} }
}); });
}); });
@@ -244,6 +245,7 @@ $(document).on('click', '[data-parents]', (event) => {
$(document).on('click', '[data-remodal-id].parents-container [data-parents-select]', (event) => { $(document).on('click', '[data-remodal-id].parents-container [data-parents-select]', (event) => {
const modal = $(event.currentTarget).closest('[data-remodal-id]'); const modal = $(event.currentTarget).closest('[data-remodal-id]');
const parents = modal.data('parents'); const parents = modal.data('parents');
const selectedField = modal.data('parentsSelectedField');
const finder = parents.finder; const finder = parents.finder;
const field = parents.field; const field = parents.field;
const parentLabel = parents.parentLabel; const parentLabel = parents.parentLabel;
@@ -252,11 +254,19 @@ $(document).on('click', '[data-remodal-id].parents-container [data-parents-selec
const value = selection._item[finder.config.valueKey]; const value = selection._item[finder.config.valueKey];
const name = selection._item[finder.config.labelKey]; const name = selection._item[finder.config.labelKey];
field.val(value); console.log('click [data-parents-select]', selectedField);
parentLabel.text(value); if (selectedField.closest('.remodal').length) {
parentName.text(name); const index = field.index(selectedField) - 1;
finder.config.defaultPath = value; selectedField.val(value);
$(parentLabel[index]).text(value);
$(parentName[index]).text(name);
} else {
field.val(value);
parentLabel.text(value);
parentName.text(name);
finder.config.defaultPath = value;
}
const remodal = $.remodal.lookup[$(`[data-remodal-id="${modal.data('remodalId')}"]`).data('remodal')]; const remodal = $.remodal.lookup[$(`[data-remodal-id="${modal.data('remodalId')}"]`).data('remodal')];
remodal.close(); remodal.close();
}); });

2
themes/grav/js/admin.min.js vendored
View File

File diff suppressed because one or more lines are too long