-
-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Accept asset/accessory improvements and fixes #11172
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: snipe <snipe@snipe.net>
It’s extraneous, since we already have a file field in the action_logs, and we already store the stored_eula_file in checkout_acceptances. Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Signed-off-by: snipe <snipe@snipe.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We're seeing a handful of problems and inconsistencies with asset acceptance, so this is a whack at refactoring some of that.
Problem 1:
The
storage/eula-pdfs
directory did not have a.gitignore
in it, which means it wasn't checked into the repo, so users trying to store the PDF would end up with errors, since the file couldn't be written to a non-existent directory. (We were also not checking to see the directory actually exists before trying to write to it.)Problem 2:
We had added an extra column to the
action_logs
table calledstored_eula_file
, but that ended up being difficult to normalize in the API and the UI - and we already have afilename
column on that table, so it makes more sense to just use that. (I'm still not entirely sure why we're duplicating the all of the data in theaction_logs
table in thecheckout_acceptances
table, but that's for another time.)Normalizing this format means we go from something like this:
to something like this:
where the "uploads" and "acceptance pdfs" both show up in a unified way in the history tab.
Problem 3:
The
stored_eula
, the actual EULA text at the time of the acceptance, is being stored but not displayed anywhere. It will likely be long, and with the PDF support, I don't see any reason to try to cram it into the UI un the history tab.I still need to do a little refactoring in the acceptance controller and clean that up a bit, but I think this isn't a bad start.
I also cleaned up the PDF layout a bit, so it looks like this now:
Still a few more tweaks to go, but I think it looks a little cleaner.
This will eventually hopefully fix #11116.