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.

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

Merge branch '6' into 7 #856

Merged
Merged
Changes from 4 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
43dc86d
API Standardise deprecations
GuySartorelli Feb 17, 2023
3f2b86b
Merge pull request #783 from creative-commoners/pulls/5/deprecations
tractorcow Feb 22, 2023
f07b036
FIX Don't try to preview unlocalised objects (#781)
GuySartorelli May 23, 2023
034dd15
Update FluentExtension.php
mikey-harveycameron May 31, 2023
53ca9ef
Merge pull request #799 from mikey-harveycameron/patch-2
tractorcow May 31, 2023
336dca2
Implement onAfterDuplicate
RVXD Jun 16, 2023
43b4214
Add onAfterDuplicate to FluentVersionedExtension
RVXD Jun 16, 2023
6313e6d
Merge pull request #804 from RVXD/patch-3
tractorcow Jun 21, 2023
9d04d7a
feat: add absolute base url for locale
tractorcow Aug 31, 2023
904e3f4
chore: fix linting
tractorcow Sep 1, 2023
ba53c83
Merge pull request #809 from tractorcow/feat/base-url
tractorcow Sep 1, 2023
9ab08d1
copy Bugfix from here https://github.com/tractorcow-farm/silverstripe…
MLindenhofer Nov 14, 2023
f18bc71
fix: allow plugins
tractorcow Nov 14, 2023
3ac5a90
Merge pull request #815 from MLindenhofer/ML_CopyFixFromMaster
tractorcow Nov 14, 2023
14ecdb1
FIX allows i18nTextCollector to concatenate keys
davejtoews Feb 8, 2024
2a8e81e
Adds full namespace to string literal
davejtoews Feb 9, 2024
42ecdc3
Merge pull request #824 from davejtoews/bugfix-textcollector-warnings
tractorcow Feb 13, 2024
f79f0f9
fix: don't invoke db for ready check outside of dev urls
tractorcow Mar 20, 2024
05ef577
fix: redundant import
tractorcow Mar 20, 2024
1685a68
Merge pull request #831 from tractorcow-farm/fix/check
tractorcow Mar 24, 2024
182e829
Merge remote-tracking branch 'origin/5.1' into 5
tractorcow Mar 24, 2024
4c1f1e8
Merge remote-tracking branch 'origin/5' into 6
tractorcow Mar 24, 2024
8985d8c
fix: check for request prior to access
tractorcow Mar 24, 2024
9e650e6
Merge pull request #833 from tractorcow-farm/fix/dbready-check-6
tractorcow Mar 24, 2024
9aea31d
NEW Added dev/task to initialise DataObjects for existing datasets
nathanbrauer Mar 27, 2024
07328cf
DOC Updated documentation for new DataObject initialisation task
nathanbrauer Apr 2, 2024
acb1466
Merge pull request #835 from nathanbrauer/feature/initial-task-for-da…
tractorcow Apr 2, 2024
f54103b
Merge branch '6.0' into 6
GuySartorelli May 23, 2024
04c6358
Merge pull request #854 from creative-commoners/pulls/6/merge-conflict
emteknetnz May 24, 2024
a702f41
Merge branch '6' into 7
GuySartorelli May 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Extension/FluentExtension.php
Original file line number Diff line number Diff line change
@@ -586,7 +586,7 @@ public function augmentSQL(SQLSelect $query, DataQuery $dataQuery = null)
if (empty($localisedPredicate)) {
continue;
}

$where[$index] = [
$localisedPredicate => $parameters
];
@@ -629,7 +629,7 @@ public function onAfterWrite(): void
{
$this->handleClassChanged();
}

/**
* If an object is duplicated also duplicate existing localised values from original to new object.
*/