Deployment #383
Merged
Deployment #383
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
Created `stream_name` attribute to machine model added `data-stream` attribute to img which is used to connect to stream socket
Before all strings could pass the regex validation. Clearified so that it is clear what needs to be changed
They fail due to a `KeyError "machine_type"` in `cleaned_data` in `make_queue.forms.EditMachineForm.clean()`.
when line 18 is uncommented, it throws the error `'set_stream_name' is not defined`
…le-stream-and-printer-name
This reverts commit 5e614b5.
Fix front page events
…d-printer-name # Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
…-name Decouple stream name from printer name
…ation-improvements # Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po # make_queue/migrations/0015_machinetype.py # make_queue/templates/make_queue/course/course_registration_list.html # make_queue/tests/models/test_reservation.py # make_queue/tests/views/test_delete_reservation_view.py # make_queue/tests/views/test_reservation_reservation.py # make_queue/views/reservation/reservation.py
* Added more conventional folder/directory locations * Added more conventional filenames * Added links to some keywords * Fixed `CreateView` paths having `/<pk>` before `/add` * Generally better wording several places
Also improved some wording and some links.
…rovements Misc. visual reservation improvements
…button # Conflicts: # internal/templates/internal/secret_list.html # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
Add button to close an open secrets
Also replaced `== x.x.*` with `>= x.x.x`, to force the server to install updated versions of those packages.
Removed testing against Python 3.7, as it's old enough for us to (safely) drop support for it. Added testing against Python 3.10.
Fix outdated dependencies
Fix event layout bug in event list
ddabble
added
hacktoberfest-accepted
deployment
Codecov Report
@@ Coverage Diff @@
## master #383 +/- ##
==========================================
+ Coverage 73.87% 83.31% +9.43%
==========================================
Files 116 119 +3
Lines 3610 3770 +160
==========================================
+ Hits 2667 3141 +474
+ Misses 943 629 -314
Continue to review full report at Codecov.
|
sigridge
approved these changes
Oct 21, 2021
There was a problem hiding this comment.
I'm approving this PR, but i have one comment that should be fixed or talked about later.
When adding a machine, and you do something "wrong" (like not picking a machinetype or writing a videostream name with characters that arent accepted), the error message is shown on the top of the form, but with no explanation about which field you messed up on.
|
@sigtheidiot Yeah, that will be fixed in #359 😅 We could fix it before that, but I'm not sure if it'll be worth the effort 🤔 |
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.
Brings in the changes from the following PRs: