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

Issue/1336 add option to hide assets in importer #130

Open
wants to merge 10 commits into
base: dev/2.4.0
Choose a base branch
from

Conversation

emanuelGitCodes
Copy link
Contributor

Changes are done to the media importer to support the deletion of assets. Also, modifications were done to establish communication between the DB and the Client.

Copy link
Contributor

@FrenjaminBanklin FrenjaminBanklin left a comment

Choose a reason for hiding this comment

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

Parts of the code could be clarified and cleaned up, and the new method in Materia.Coms.Json is not currently using provided objects properly.

src/js/controllers/ctrl-media-import.js Outdated Show resolved Hide resolved
src/js/controllers/ctrl-media-import.js Outdated Show resolved Hide resolved
src/js/controllers/ctrl-media-import.js Outdated Show resolved Hide resolved
src/js/controllers/ctrl-media-import.js Outdated Show resolved Hide resolved
src/js/controllers/ctrl-media-import.js Outdated Show resolved Hide resolved
src/js/controllers/ctrl-media-import.js Outdated Show resolved Hide resolved
src/js/directives/dir-assetDeletion.js Outdated Show resolved Hide resolved
src/js/materia/materia.coms.json.js Outdated Show resolved Hide resolved
src/js/services/srv-asset.js Outdated Show resolved Hide resolved
src/js/services/srv-asset.js Outdated Show resolved Hide resolved
Copy link
Member

@clpetersonucf clpetersonucf left a comment

Choose a reason for hiding this comment

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

This PR includes the original .obj support code that was merged and added to MSCA 2.4.0 via a different PR. I would merge the current master into this branch and resolve the conflicts related to the .obj support code (prefer incoming changes), so the diff is clean with only the changes required for hiding/displaying deleted assets.

Copy link
Member

@clpetersonucf clpetersonucf left a comment

Choose a reason for hiding this comment

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

Looking better, just one section that needs to be removed.

})
});

// obj file extensions MIME_TYPE changes based on upload or download.
Copy link
Member

Choose a reason for hiding this comment

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

This section (from lines 162 through 172) is still from the now obsolete obj support code and should be removed.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Removed it

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants