fix the case when relation is set to null

Merge pull request 'generated unique slug should be part of diff' (#20 ) from bugfix/generated-unique-slug-should-be-part-of-diff into master
Reviewed-on: #20
2023-05-28 15:46:13 +02:00 · 2023-05-28 15:45:58 +02:00 · 2023-05-28 15:45:19 +02:00 · 2023-05-28 15:45:10 +02:00 · 2023-05-27 10:56:20 +02:00
2 changed files with 7 additions and 2 deletions
--- a/src/PersistentData/PersistentDataManager.php
+++ b/src/PersistentData/PersistentDataManager.php
@ -115,7 +115,7 @@ class PersistentDataManager implements IPersistentDataManager

            if (count($modified) > 0) {
                if ($model instanceof ModelWithSlug && isset($modified['slug'])) {
-                    $modified['slug'] = $this->generateUniqueSlug($model, $modified['slug']);
+                    $diff['slug']['new'] = $modified['slug'] = $this->generateUniqueSlug($model, $modified['slug']);
                }

                $modify->setId($id);
--- a/src/View/Linker.php
+++ b/src/View/Linker.php
@ -97,8 +97,13 @@ class Linker

        fwrite($outputFileHandle, $extra[0]);
        while (($line = fgets($inputFileHandle)) !== false) {
+            if (preg_match('/^\s*@include\((.*)\)\s*$/', $line, $matches) === 1) {
+                $include = file_get_contents(ROOT . '/views/' . $matches[1] . '.php');
+                fwrite($outputFileHandle, $include);
+            } else {
                fwrite($outputFileHandle, $line);
            }
+        }
        fwrite($outputFileHandle, $extra[1]);

        fclose($inputFileHandle);
Author	SHA1	Message	Date
Pőcze Bence	25548176bb	fix the case when relation is set to null All checks were successful soko-web/pipeline/pr-master This commit looks good Details	2023-05-28 15:46:13 +02:00
Bence Pőcze	f31b801c03	Merge pull request 'generated unique slug should be part of diff' (#20 ) from bugfix/generated-unique-slug-should-be-part-of-diff into master All checks were successful soko-web/pipeline/head This commit looks good Details Reviewed-on: #20	2023-05-28 15:45:58 +02:00
Pőcze Bence	346b1a0ca9	generated unique slug should be part of diff All checks were successful soko-web/pipeline/pr-master This commit looks good Details	2023-05-28 15:45:19 +02:00
Bence Pőcze	6fdd25ae4b	Merge pull request 'MAPG-238 include view with @include' (#19 ) from feature/MAPG-238-include-possibility-for-templating-engine into master All checks were successful soko-web/pipeline/head This commit looks good Details Reviewed-on: #19	2023-05-28 15:45:10 +02:00
Pőcze Bence	754a23706a	MAPG-238 include view with @include All checks were successful soko-web/pipeline/pr-master This commit looks good Details	2023-05-27 10:56:20 +02:00