Rework of some of the reservation validation logic #609
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
Now the user dropdowns on both the quota admin page and the quota form page, sort (alphabetically, after concatenating the first and last names), search (fuzzy `fullTextSearch`) and format (using an `–` between the full name and username) their user strings equally.
The `can_change()` method doesn't (seemingly arbitrarily) validate the start time anymore - the latter of which has been moved to `can_change_start_time()` - and has been more fittingly renamed to `can_be_changed_by(user)`. The `can_change_end_time()` method also doesn't validate the user anymore, as that logic already exists in `can_be_changed_by()`. With this, the code functionality has changed and the tests fail, as I had slightly misunderstood the previous logic. This will be fixed in the next commit. Also renamed the `can_delete()` method.
The tests now work again, and the code should be easier to understand.
This doesn't change anything in practice, as the user is not allowed to view the page if the end time can't be changed, but this ensures that the form would behave as expected if that were to change.
...when the machine is set to "OUT_OF_ORDER" or "MAINTENANCE". Also made it possible to change the start time of those reservations, as long as it's set forward in time - so that the reservation is shortened - as that will at the very least be less disruptive to the people doing maintenance on the machines - which is the same reason as to why the end time can only be set earlier in time in the same scenario. This resolves #580.
|
Merging without explicit approval from another member, as the Dev committee agreed to merge these changes and assume they're relatively bug-free, simply to get things done quicker. |
Merged
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.
Proposed changes
Improvements
can_change[...]methods ofReservation(2a6a92f)end_timein reservation form if the user can't change it (f1680cc)Fixes
OUT_OF_ORDERorMAINTENANCE(57ed822)Other changes
Areas to review closely
That the reservation logic works as intended.
Checklist
(If any of the points are not relevant, mark them as checked)