Skip to content

P
Platform
Unverified Commit 6c771cf5 authored by Nicolas Widart's avatar Nicolas Widart Committed by GitHub
Browse files
Options

Merge pull request #644 from mikemand/feature/media-deeply-nested-objects 

Allow deeply nested objects to have media
parents 9c5b5d71 773f160a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 26049 additions and 24244 deletions
.gitignore
View file @ 6c771cf5
...@@ -10,5 +10,6 @@ yarn-error.log ...@@ -10,5 +10,6 @@ yarn-error.log
.env .env
composer.lock composer.lock
package-lock.json package-lock.json
yarn.lock
.phpunit.result.cache .phpunit.result.cache
.php_cs.cache .php_cs.cache
Modules/Media/Assets/js/mixins/MultipleFileSelector.js
View file @ 6c771cf5
import t from 'typy';
export default { export default {
methods: { methods: {
selectMultipleFile(event, model) { selectMultipleFile(event, model) {
if (typeof this[model].medias_multi === 'undefined') { const entity = t(this, model).safeObject;
this.$set(model, 'medias_multi', {});
if (typeof entity.medias_multi === 'undefined') {
this.$set(entity, 'medias_multi', {});
} }
if (typeof this[model].medias_multi[event.zone] === 'undefined') { if (typeof entity.medias_multi[event.zone] === 'undefined') {
this.$set(this[model].medias_multi, event.zone, { files: [], orders: '' }); this.$set(entity.medias_multi, event.zone, { files: [], orders: '' });
} }
if (event.id !== null && event.id !== undefined) { if (event.id !== null && event.id !== undefined) {
const medias = new Set(this[model].medias_multi[event.zone].files); const medias = new Set(entity.medias_multi[event.zone].files);
medias.add(event.id); medias.add(event.id);
this.$set(this[model].medias_multi[event.zone], 'files', [...medias]); this.$set(entity.medias_multi[event.zone], 'files', [...medias]);
} }
}, },
unselectFile(event, model) { unselectFile(event, model) {
const entity = t(this, model).safeObject;
if (event.id !== null && event.id !== undefined) { if (event.id !== null && event.id !== undefined) {
const medias = new Set(this[model].medias_multi[event.zone].files); const medias = new Set(entity.medias_multi[event.zone].files);
medias.delete(event.id); medias.delete(event.id);
this.$set(this[model].medias_multi[event.zone], 'files', [...medias]); this.$set(entity.medias_multi[event.zone], 'files', [...medias]);
} }
if (this[model].medias_multi[event.zone].files.length === 0) { if (entity.medias_multi[event.zone].files.length === 0) {
this.$delete(this[model].medias_multi, event.zone); this.$delete(entity.medias_multi, event.zone);
} }
}, },
}, },
......
Modules/Media/Assets/js/mixins/SingleFileSelector.js
View file @ 6c771cf5
import t from 'typy';
export default { export default {
methods: { methods: {
selectSingleFile(event, model) { selectSingleFile(event, model) {
if (typeof this[model].medias_single === 'undefined') { const entity = t(this, model).safeObject;
this.$set(this[model], 'medias_single', {});
if (typeof entity.medias_single === 'undefined') {
this.$set(entity, 'medias_single', {});
} }
if (typeof this[model].medias_single[event.zone] === 'undefined') { if (typeof entity.medias_single[event.zone] === 'undefined') {
this.$set(this[model].medias_single, event.zone, null); this.$set(entity.medias_single, event.zone, null);
} }
if (event.id !== null && event.id !== undefined) { if (event.id !== null && event.id !== undefined) {
this.$set(this[model].medias_single, event.zone, event.id); this.$set(entity.medias_single, event.zone, event.id);
} else { } else {
this.$delete(this[model].medias_single, event.zone); this.$delete(entity.medias_single, event.zone);
} }
}, },
}, },
......
public/css/app.css
View file @ 6c771cf5
This source diff could not be displayed because it is too large. You can view the blob instead.
public/js/app.js
View file @ 6c771cf5
This diff is collapsed.
public/mix-manifest.json
View file @ 6c771cf5
{ {
"/js/app.js": "/js/app.js", "/js/app.js": "/js/app.js",
"/css/app.css": "/css/app.css" "/css/app.css": "/css/app.css"
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023