Deployment #461
Merged
Deployment #461
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
…o MAKE-members are moved to new template.
…status # Conflicts: # checkin/templates/checkin/profile.html # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
# Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
The information presented should be roughly the same, but the messages' focus is on course completion instead of access (which is what the `if` statements check for), and it's now listed in a table with checkboxes instead of paragraphs. Also added a contact message at the bottom of the profile page, and moved the user's name to the top heading, to make it look better when the profile picture is not shown (for non-internal users).
Show 3D printer access status
...instead of the `ui` and `fields` classes always being inserted. This should give the views a little bit more freedom to specify the exact classes desired.
Now that it's split into two methods, it's easier to customize `MachineType` querysets using each method as desired.
This makes machines only visible to and reservable by MAKE members.
The view was updated in the last commit to always include all machine types in its context data (instead of only the machine types with machines), and instead filter the shown machine types in the template.
It now uses an actual CSS grid (instead of a flexbox that Fomantic-UI's `.ui.grid` curiously uses), which makes the code a lot simpler. Also moved some code from `machine_detail.css` to `reservation_actions.css`, where it belongs.
Also fixed an error in `locale_utils.attempt_as_local()`, which could occur if the passed value was too low or high, which was the case with the `info_message_date` set for existing machines in `0030_machine_info_message.py`.
This reflects the fact that the course in question is only really for Raise3D printers specifically. It also reduces the potential for confusion when we later on add an SLA 3D printer course (which is technically also an "advanced" course). Also set the `priority` of the "Workspaces" machine type to 100, like on the production website.
Also removed the `image` template context variable, as it can simply be accessed through `profile` instead, Also, removed the "Connect card number from course registration to user" code, which actually did nothing, as the lookup query checked the username of an already connected user (`user__username`), and then simply overwrote the registration's user with the same user. Furthermore, modifying the database is generally something that should be done in a GET request, and (working) code for connecting the card number from a course registration to a user, already exists in more appropriate places in the codebase.
This should make the code more maintainable.
This was requested by the Mentor committee.
Bumps [phonenumbers](https://github.com/daviddrysdale/python-phonenumbers) from 8.12.48 to 8.12.49. - [Release notes](https://github.com/daviddrysdale/python-phonenumbers/releases) - [Commits](daviddrysdale/python-phonenumbers@v8.12.48...v8.12.49) --- updated-dependencies: - dependency-name: phonenumbers dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [django-ckeditor](https://github.com/django-ckeditor/django-ckeditor) from 6.4.1 to 6.4.2. - [Release notes](https://github.com/django-ckeditor/django-ckeditor/releases) - [Changelog](https://github.com/django-ckeditor/django-ckeditor/blob/master/CHANGELOG.rst) - [Commits](django-ckeditor/django-ckeditor@6.4.1...6.4.2) --- updated-dependencies: - dependency-name: django-ckeditor dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
In other words, the change pages of content boxes can only be reached on the same subdomain as the display page of the content box is defined on.
This also lets us remove the cleaning code in `ContentBoxForm`. Also made `MultiLingualTextStructure`'s `use_default_for_empty` argument keyword-only.
This file was generated (and later manually customized) using PyCharm (2021.3), by going to File -> Settings -> Editor -> Code Style, and then clicking the cog wheel next to the "Scheme" dropdown and selecting Export -> EditorConfig File.
Also reformatted `docker-compose.yml`.
Also renamed the view, and added an `InternalDisplayContentBoxView` - which `HomeView` now extends.
...because it didn't contain any code, and was made obsolete after replacing `MAKEHistoryView` with a standard (`Internal`)`DisplayContentBoxView`, which was done to simplify the code.
Also changed `web/header.html` (and the associated CSS and JS file) to accommodate this, by being slightly more generic. Also changed the title of the header button.
Add internal Contentbox for MAKE's history
Add .editorconfig
…e-language # Conflicts: # CHANGELOG.md # contentbox/tests/test_urls.py
Secrets only use one language
# Conflicts: # CHANGELOG.md # locale/nb/LC_MESSAGES/django.mo
Cleanup of some templates
# Conflicts: # CHANGELOG.md # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
This fixes the `.text-border-corner` images with the `.top` class from having the wrong height.
Add various machine fields + SLA machine type and course
Had to add context to the existing "Front page" translation, to enable `committee_navbar.html` using a different translation.
* Added translations to `aria-labels` * Refactored the committee color code
…ent-boxes Internal "bulletin board" content boxes for each committee
Also moved the `<link>` tag for `index.css` below the other tags, to make the rules in `index.css` (more easily) override the ones in the above stylesheets.
ddabble
added
the
deployment
Codecov Report
@@ Coverage Diff @@
## main #461 +/- ##
==========================================
+ Coverage 87.95% 88.03% +0.08%
==========================================
Files 134 134
Lines 5386 5451 +65
==========================================
+ Hits 4737 4799 +62
- Misses 649 652 +3
Continue to review full report at Codecov.
|
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:
Also the following automated PRs: