Skip to content

Commit

Permalink
Merge branch 'custom-entities-export-import' of https://github.com/ow…
Browse files Browse the repository at this point in the history
…lchester/kanka into custom-entities-export-import
  • Loading branch information
spitfire305 committed Jan 29, 2025
2 parents b684039 + 1051892 commit 2d2384e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/Services/Campaign/ExportService.php
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ protected function processImage(Image $image): self

protected function process(string $entity, $model): self
{

if ($model instanceof Entity) {
$modelEntity = $model;
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected function trackMappings(?string $parent = null): void
}

protected function entity(): void
{
{
$entityMapping = ['name', 'is_private', 'tooltip', 'is_template', 'is_attributes_private', 'focus_x', 'focus_y', 'entry', 'type'];
$this->entity = new Entity();
$this->entity->created_by = $this->user->id;
Expand Down
4 changes: 2 additions & 2 deletions app/Services/Campaign/Import/Mappers/CustomMapper.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class CustomMapper
protected array $parents = [];
protected array $ignore = ['id', 'campaign_id', 'slug', 'image', '_lft', '_rgt', 'parent_id', 'created_at', 'updated_at'];
protected string $mappingName;

public function prepare(): self
{
//$this->campaign->{$this->mappingName}()->forceDelete();
Expand All @@ -41,7 +41,7 @@ public function second(): void
->loadEntity()
->saveEntity()
->entitySecond()
;
;
}

public function tree(): self
Expand Down

0 comments on commit 2d2384e

Please sign in to comment.