Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for Asset ID matching #1327

Merged
merged 2 commits into from
May 23, 2024
Merged

Add support for Asset ID matching #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0999bf9
Add support for Asset ID matching
domstubbs Jun 2, 2023
841a021
Fix indentation
domstubbs Jun 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/fields/Assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public function parseField(): mixed
$limit = Hash::get($this->field, 'settings.limit');
$targetSiteId = Hash::get($this->field, 'settings.targetSiteId');
$feedSiteId = Hash::get($this->feed, 'siteId');
$match = Hash::get($this->fieldInfo, 'options.match', 'filename');
$upload = Hash::get($this->fieldInfo, 'options.upload');
$conflict = Hash::get($this->fieldInfo, 'options.conflict');
$fields = Hash::get($this->fieldInfo, 'fields');
Expand Down Expand Up @@ -165,7 +166,13 @@ public function parseField(): mixed
$criteria['folderId'] = $folderIds;
$criteria['kind'] = $settings['allowedKinds'];
$criteria['limit'] = $limit;
$criteria['filename'] = $filename;

if ($match === 'id') {
$criteria['id'] = $dataValue;
} else {
$criteria['filename'] = $filename;
}

$criteria['includeSubfolders'] = true;

Craft::configure($query, $criteria);
Expand Down
14 changes: 14 additions & 0 deletions src/templates/_includes/fields/assets.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,20 @@

{% block extraSettings %}

<div class="element-match assets-matching">
<span>{{ 'Data provided for this asset is:'|t('feed-me') }}</span>

{{ forms.selectField({
name: 'options[match]',
class: '',
value: hash_get(feed.fieldMapping, optionsPath ~ '.match') ?: '',
options: [
{ value: 'filename', label: 'Filename'|t('feed-me') },
{ value: 'id', label: 'ID'|t('feed-me') },
],
}) }}
</div>

<div class="assets-uploads">
{{ feedMeMacro.checkbox({
label: 'Create asset from URL<span class="asset-label-hide">, if exists:</span>'|t('feed-me')|raw,
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/feedme/dist/FeedMe.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/feedme/dist/FeedMe.js.map
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions src/web/assets/feedme/src/js/feed-me.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ $(function () {

// For Assets, only show the upload options if we decide to upload
$('.assets-uploads input').on('change', function (e) {
var $options = $(this).parents('.field-extra-settings').find('.select');
var $options = $(this).parents('.assets-uploads').find('.select');
var $label = $(this)
.parents('.field-extra-settings')
.find('.asset-label-hide');
Expand All @@ -131,8 +131,19 @@ $(function () {
}
});

// For Assets, hide Create Asset checkbox if ID values are selected
$('.assets-matching select').on('change', function (e) {
var $assetsUploads = $('.assets-uploads');
if ($(this).val() === 'id') {
$('input', $assetsUploads).prop('checked', false).trigger('change');
$assetsUploads.css({opacity: 0, visibility: 'hidden'});
} else {
$assetsUploads.css({opacity: 1, visibility: 'visible'});
}
});

// On-load, hide/show upload options
$('.assets-uploads input').trigger('change');
$('.assets-uploads input, .assets-matching select').trigger('change');

// For elements, show the grouping select(s)
$('.field-extra-settings .element-create input').on('change', function (e) {
Expand Down