Deployment #389
Merged
Deployment #389
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
# Conflicts: # faq/admin.py # faq/forms.py # faq/templates/faq/admin_question_list.html # faq/views.py
The reason for this is that the two tags can be useful to use in contexts other than the "semantic_ui_calendar". Also renamed them.
Also removed `overview.py`, as it's now empty.
They now more closely follow the names of Django's generic views, like `ListView` and `DetailView` (with matching path names).
Because overriding the blocks in child templates does not overwrite all of the contents of the `<head>` tag or existing scripts, but adds additional content to them.
Also moved links to stylesheets and scripts in all `header.html`s to the respective `base.html`'s `<head>` tag.
Also moved linking `delete_modal.js` to `base.html`.
# Conflicts: # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po # make_queue/models/reservation.py # make_queue/templates/make_queue/machine/machine_edit.html # make_queue/tests/views/test_machine_views.py # make_queue/urls.py # make_queue/views/admin/course.py # news/tests/views/test_article_views.py # news/tests/views/test_event_time_place_views.py # web/templates/web/index.html # web/tests/tests.py # web/urls.py
...when not logged in. They will redirect the user to the login page if clicked on.
In addition to general logic improvements in `dataporten/views.py`, the user's username is now also extracted from the social data, and prioritized over the username from LDAP. Also added checks of whether the values for updating `first_name`/`last_name`/`ldap_full_name`/`username` exist or not, before saving the user. Also, removed the unused (and deprecated) requirement `python-social-auth`.
This fixes the bug that occurred when looking up the quotas of a user with e.g. and underscore in their name, as it didn't match the regex of the `UserByUsername` converter. Also removed the `UserByUsername` converter, now that it's not used anymore.
...for removing old files and images when a model object is changed or deleted.
After a page refresh of the course registration list, without changing the sorting or filtering: If the order of the users from the template context differed from the order that they would appear in after being sorted with the `sort()` function, the rows that were "out of place" would disappear when selecting them (they would actually just "jump" to their proper place - determined by the `sort()` function - which often happened to be on another list page). This has now been fixed by sorting the list on page load.
…-admin # Conflicts: # faq/templates/faq/admin_question_list.html # faq/urls.py # faq/views.py # locale/nb/LC_MESSAGES/django.mo # locale/nb/LC_MESSAGES/django.po
Co-authored-by: Anders <6058745+ddabble@users.noreply.github.com>
Different Images for stream
Also reordered some of the views' fields.
This was for consistency, as the styling made the title have a slightly larger bottom margin than most other admin pages.
The new code utilizes more of the built-in classes in Fomantic-UI.
This fixes the bug that made them look like they were "extended" without having clicked any of the accordion elements.
The FAQ page is now also not listing categories with no questions.
This partly reverts 613b1e3.
They now lead to their respective admin list pages, instead of the FAQ admin panel.
Added categories on admin page
ddabble
added
hacktoberfest-accepted
deployment
Codecov Report
@@ Coverage Diff @@
## master #389 +/- ##
==========================================
+ Coverage 83.31% 83.71% +0.39%
==========================================
Files 119 118 -1
Lines 3770 3837 +67
==========================================
+ Hits 3141 3212 +71
+ Misses 629 625 -4
Continue to review full report at Codecov.
|
sigridge
requested changes
Oct 29, 2021
|
@sigtheidiot Ah, yes, I've seen the same error before on my machine as well, though it should not happen on the server 🙂 It's "fixed" in #360 (specifically f99184f8382a46f872d355d337dfaf3c20f76a3e) 🤠 |
Perfect, then i'll go and approve |
sigridge
approved these changes
Oct 29, 2021
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: