Skip to content

Pro 7563 images checkbox #4918

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 3 commits into from
Apr 14, 2025
Merged

Pro 7563 images checkbox #4918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c54c5a3
lint
ValJed Apr 14, 2025
89a3a6d
removes hide checkboxes in media manager
ValJed Apr 14, 2025
be381f3
adds changelog
ValJed Apr 14, 2025
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* Change reset password form button label to `Reset Password`.
* Removed overly verbose logging of schema errors in the schema module itself. These are already logged appropriately if they become the actual result of an API call. With this change it becomes possible to catch and discard or mitigate these in some situations without excessive log output.
* Bumps eslint-config-apostrophe, fix errors and a bunch of warnings.
* Gets back checkboxes in the media manager.

### Fixes

Expand Down
3 changes: 0 additions & 3 deletions modules/@apostrophecms/image/ui/apos/components/AposMediaManager.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@
:module-options="moduleOptions"
:max-reached="maxReached()"
:is-last-page="isLastPage"
:options="{
hideCheckboxes: !relationshipField
}"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you see another context where we would like to hide them?

:relationship-field="relationshipField"
:is-scroll-loading="isScrollLoading"
@edit="updateEditing"
Expand Down
7 changes: 5 additions & 2 deletions modules/@apostrophecms/image/ui/apos/components/AposMediaManagerDisplay.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ export default {
options: {
type: Object,
default() {
return {};
return {
hideCheckboxes: false
};
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Default options

}
},
accept: {
Expand Down Expand Up @@ -265,7 +267,8 @@ export default {
}

.apos-media-manager-display__cell:hover .apos-media-manager-display__checkbox,
.apos-media-manager-display__cell.apos-is-selected .apos-media-manager-display__checkbox {
.apos-media-manager-display__cell.apos-is-selected
.apos-media-manager-display__checkbox {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

linter

opacity: 1;
}

Expand Down
10 changes: 8 additions & 2 deletions modules/@apostrophecms/modal/ui/apos/mixins/AposDocsManagerMixin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,16 @@ export default {
// Treated as min for consistency with AposMinMaxCount
return 'min';
}
if (this.relationshipField.min && this.checked.length < this.relationshipField.min) {
if (
this.relationshipField.min &&
this.checked.length < this.relationshipField.min
) {
return 'min';
}
if (this.relationshipField.max && this.checked.length > this.relationshipField.max) {
if (
this.relationshipField.max &&
this.checked.length > this.relationshipField.max
) {
return 'max';
}

Expand Down
Loading