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

Fixed #9813: Duplicate function accept-asset #9822

Merged
merged 2 commits into from
Jun 29, 2022

Conversation

dampfklon
Copy link
Contributor

Description

The old and not longer used route https://demo.snipeitapp.com/account/view-assets/9 got remove with its controller functions and view.

The new view has now localization support, no new strings were needed. I also switch the position of the Accept/Decline Ratio Buttons and the Eula, so the user first reads the Eula and then selects Accept or Decline and if active directly below signs it.
Lastly I made small design changes to the view.

Preview after the changes:
https://imgur.com/Aj9u0Y6

Fixes #9813

Type of change

Please delete options that are not relevant.

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration

  • Checkout Assets with its category enabled acceptance workflow
  • Open Acceptance link from confirmation mail
  • Check different eula length, with and without signature for any gliches
  • Accept asset

Test Configuration:

  • PHP version: 7.3.27
  • MySQL version: mariadb 10.5.9
  • Webserver version: apache 2.4.46
  • OS version: Docker Alpine Container

Checklist:

@snipe
Copy link
Owner

snipe commented Jul 14, 2021

@inietov Can you test this PR for me when you get a moment? Thanks!

Copy link
Collaborator

@inietov inietov left a comment

Choose a reason for hiding this comment

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

Thanks for this clean up on our routes. Looks good to me, works as described in my local, and I actually like more how it looks the acceptance screen now.

Thanks again for your time putting this together!!.

@dampfklon
Copy link
Contributor Author

As reqested in the roadmap post, I also created a v6 PR #9857

@dampfklon
Copy link
Contributor Author

I there anything else to do, to get the pr merged?

@snipe
Copy link
Owner

snipe commented Oct 29, 2021

@dampfklon Sorry this took so long. I'm seeing some merge conflicts that one of us will have to get handled before I can merge :(

@dampfklon
Copy link
Contributor Author

@snipe Took me also some time to fix the merge conflicts. It's now fixed.

@dampfklon
Copy link
Contributor Author

Would be nice if this would make it into the v6 release.

@snipe snipe merged commit 5b02d9e into snipe:develop Jun 29, 2022
@dampfklon dampfklon deleted the 9813-duplicate-accept-asset branch June 29, 2022 15:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants