Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/4.x' into 4.x-development
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	composer.json
  • Loading branch information
hadomskyi committed Apr 10, 2024
2 parents eaefd11 + 5302daa commit e16efd2
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
### Added
- Introduced a new configuration setting that allows the disabling of automatic synchronization for jobs that are currently in progress

## 4.4.3 - 2023-11-15
## 4.4.5 - 2024-02-09
### Fixed
- Translation of nested link field

## 4.4.4 - 2024-01-31
### Changed
- Change translations batch size

## 4.4.3 - 2024-01-30
### Changed
- Change translation limit for get translation request

Expand Down
2 changes: 1 addition & 1 deletion src/assets/resources/job-translation-review.js
Original file line number Diff line number Diff line change
Expand Up @@ -475,11 +475,11 @@ $(document).ready(function() {
criteria: {
jobId: jQuery('#create-job-form').data('job-id'),
},
batchSize: 1000,
selectable: true,
multiSelect: true,
checkboxMode: true,
onUpdateElements: function() {

const elements = CraftliltPlugin.elementIndexTranslation.view.getAllElements().get();

console.log(elements)
Expand Down
13 changes: 11 additions & 2 deletions src/services/appliers/field/LenzLinkFieldContentApplier.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,20 @@ public function apply(ApplyContentCommand $command): ApplyContentResult
$fieldValue = $command->getElement()->getFieldValue(
$field->handle
);

$fieldValue->customText = $content[$fieldKey];

$command->getElement()->setFieldValue($field->handle, $fieldValue);
$serialized = $field->serializeValue($fieldValue, $command->getElement());
$command->getElement()->setFieldValues([$field->handle => $serialized]);

$this->forceSave($command);

return ApplyContentResult::applied();
return ApplyContentResult::applied(
[],
$command->getElement()->getFieldValue(
$command->getField()->handle
)
);
}

public function support(ApplyContentCommand $command): bool
Expand Down

0 comments on commit e16efd2

Please sign in to comment.