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

FIX folders always go first when ordering #936

Merged

Conversation

dnsl48
Copy link
Contributor

@dnsl48 dnsl48 commented Apr 17, 2019

Fix for #893
Also fixes the original fluent issue (#820)

Notes

  • tested on silverstripe/installer 4.x-dev
  • tested on silverstripe/installer 4.2.x-dev
  • tested on cwp/cwp-recipe-kitchen-sink ^2

@robbieaverill
Copy link
Contributor

Minor point that I think this is a bug fix not a feature re: the commit prefix

@dnsl48 dnsl48 force-pushed the pulls/1.2/folders-go-first branch from 4f200a3 to b5a454b Compare April 17, 2019 20:45
@dnsl48
Copy link
Contributor Author

dnsl48 commented Apr 17, 2019

Minor point that I think this is a bug fix not a feature re: the commit prefix

true. fixed

code/GraphQL/FolderTypeCreator.php Outdated Show resolved Hide resolved
code/GraphQL/FolderTypeCreator.php Outdated Show resolved Hide resolved
@robbieaverill robbieaverill changed the title FEATURE folders always go first when ordering FIX folders always go first when ordering Apr 17, 2019
@dnsl48 dnsl48 force-pushed the pulls/1.2/folders-go-first branch from b5a454b to bfa6733 Compare April 17, 2019 22:34
// see related issues for more details:
// - https://github.com/silverstripe/silverstripe-asset-admin/issues/820
// - https://github.com/silverstripe/silverstripe-asset-admin/issues/893
$field = $query->expressionForField(trim($field, '"')) ?: $field;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One of these issues is closed and the other is the one that is resolved by this PR. I'm going to remove these links from the comments.

@unclecheese unclecheese merged commit e6c1061 into silverstripe:1.2 Apr 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants