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

Properly handle Collections that specify a custom key, rather than falling back to indexed list (fixes #632)

Browse Source
This commit is contained in:
Djamil Legato
2016-06-01 15:46:27 -07:00
parent 7b0e691090
commit ae087668ba
4 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -23,6 +23,7 @@
* Always submit checkboxes that are not checked and force a 0 value [#616](https://github.com/getgrav/grav-plugin-admin/issues/616)
* Fix encoding in tooltips again [#622](https://github.com/getgrav/grav-plugin-admin/issues/622)
* Do not show `move` cursor for Collections that aren't sortable [#624](https://github.com/getgrav/grav-plugin-admin/issues/624)
* Properly handle Collections that specify a custom key, rather than falling back to indexed list [#632](https://github.com/getgrav/grav-plugin-admin/issues/632)
# v1.1.0-beta.5
## 05/23/2016

30
themes/grav/app/forms/fields/collections.js
View File

@@ -17,6 +17,7 @@ export default class CollectionsField {
list.on('click', '> .collection-actions [data-action="add"]', (event) => this.addItem(event));
list.on('click', '> ul > li > .item-actions [data-action="delete"]', (event) => this.removeItem(event));
list.on('input', '[data-key-observe]', (event) => this.observeKey(event));
list.find('[data-collection-holder]').each((index, container) => {
container = $(container);
@@ -52,28 +53,43 @@ export default class CollectionsField {
this.reindex(list);
}
reindex(list) {
list = $(list).closest('[data-type="collection"]');
observeKey(event) {
let input = $(event.target);
let value = input.val();
let item = input.closest('[data-collection-key]');
let items = list.find('> ul > [data-collection-item]');
item.data('collection-key-backup', item.data('collection-key')).data('collection-key', value);
this.reindex(null, item);
}
reindex(list, items) {
items = items || $(list).closest('[data-type="collection"]').find('> ul > [data-collection-item]');
items.each((index, item) => {
item = $(item);
item.attr('data-collection-key', index);
let observed = item.find('[data-key-observe]');
let hasCustomKey = observed.length;
let currentKey = item.data('collection-key-backup');
item.attr('data-collection-key', hasCustomKey ? observed.val() : index);
['name', 'data-grav-field-name', 'for', 'id'].forEach((prop) => {
item.find('[' + prop + ']').each(function() {
let element = $(this);
let indexes = [];
let regexps = [
new RegExp('\\[(\\d+|\\*|' + currentKey + ')\\]', 'g'),
new RegExp('\\.(\\d+|\\*|' + currentKey + ')\\.', 'g')
];
element.parents('[data-collection-key]').map((idx, parent) => indexes.push($(parent).attr('data-collection-key')));
indexes.reverse();
let replaced = element.attr(prop).replace(/\[(\d+|\*)\]/g, (/* str, p1, offset */) => {
return `[${indexes.shift()}]`;
let replaced = element.attr(prop).replace(regexps[0], (/* str, p1, offset */) => {
return `[${indexes.shift() || currentKey}]`;
});
replaced = replaced.replace(/\.(\d+|\*)\./g, (/* str, p1, offset */) => {
replaced = replaced.replace(regexps[1], (/* str, p1, offset */) => {
return `.${indexes.shift()}.`;
});

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

File diff suppressed because one or more lines are too long

2
themes/grav/templates/forms/fields/key/key.html.twig
View File

@@ -5,7 +5,7 @@
<input
type="text"
value="{{ value|e('html_attr')|join(', ') }}"
data-list-key="{{ scope|fieldName }}"
data-key-observe="{{ (scope ~ field.name)|fieldName }}"
{% block input_attributes %}
{% if field.classes is defined %}class="{{ field.classes }}" {% endif %}
{% if field.id is defined %}id="{{ field.id|e }}" {% endif %}