Skip to content

Feature/cms 989 temp upload location filesystem #13957

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.

Sign up for GitHub

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

Merged
merged 19 commits into from
Dec 21, 2023
Merged

Feature/cms 989 temp upload location filesystem #13957

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9644216
temporary uploads filesystem - WIP
i-just Nov 21, 2023
a7f5d79
Merge branch '5.0' into feature/cms-989-temp-upload-location-filesystem
i-just Nov 21, 2023
3f2bb46
remote fs compatibility
i-just Nov 21, 2023
9909bbd
use collections when getting fsOptions
i-just Nov 22, 2023
c5bd755
uncommented for v5; if fs doesn't have URLs or used as temp
i-just Nov 22, 2023
a08ed43
disallow reusing the tempUploadsFs
i-just Nov 22, 2023
28bafc1
page render test updated
i-just Nov 22, 2023
2df552e
Merge branch '5.0' into feature/cms-989-temp-upload-location-filesystem
i-just Nov 28, 2023
fd904f5
volume validation
i-just Nov 28, 2023
8dda7f0
Temporary Uploads assets - show location without links
i-just Nov 28, 2023
25a74fe
updated volume fsHandle error message
i-just Nov 29, 2023
7168ef9
validate volume transformFsHandle too
i-just Nov 29, 2023
035c173
added attribute labels
i-just Dec 11, 2023
61c6562
Merge branch '5.0' into feature/cms-989-temp-upload-location-filesystem
i-just Dec 12, 2023
771c19b
tempUploadsFs -> tempAssetUploadFs
i-just Dec 12, 2023
a019e5c
Merge branch '5.0' into feature/cms-989-temp-upload-location-filesystem
brandonkelly Dec 20, 2023
2dc93e4
Cleanup + env support
brandonkelly Dec 20, 2023
1368e82
Remove unused translations
brandonkelly Dec 21, 2023
6f5807b
Release notes
brandonkelly Dec 21, 2023
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
Prev Previous commit
Next Next commit
validate volume transformFsHandle too
  • Loading branch information
@i-just
i-just committed Nov 29, 2023
commit 7168ef93f160f897fc1dbb25419c3e7adbf2d44c
9 changes: 9 additions & 0 deletions src/models/Volume.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,15 @@ protected function defineRules(): array
'compareAttribute' => 'fsHandle',
'compareValue' => Craft::$app->getConfig()->getGeneral()->tempUploadsFs,
'operator' => '!=',
'message' => Craft::t('app', 'This filesystem has been reserved for temporary asset uploads. Please choose a different one for your volume.'),
];
$rules[] = [
['transformFsHandle'],
'compare',
'compareAttribute' => 'transformFsHandle',
'compareValue' => Craft::$app->getConfig()->getGeneral()->tempUploadsFs,
'operator' => '!=',
'message' => Craft::t('app', 'This filesystem has been reserved for temporary asset uploads. Please choose a different one for your volume.'),
];

return $rules;
Expand Down
3 changes: 2 additions & 1 deletion src/templates/settings/assets/volumes/_edit.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
name: 'transformFsHandle',
includeEnvVars: true,
value: volume.transformFsHandle(false),
options: [{label: 'Same as asset filesystem'|t('app'), value: null}]|merge(craft.cp.getFsOptions())
options: [{label: 'Same as asset filesystem'|t('app'), value: null}]|merge(craft.cp.getFsOptions()),
errors: volume.getErrors('transformFsHandle'),
}) }}

{{ forms.textField({
Expand Down