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

Added categories on admin page #345

Merged
merged 19 commits into from
Oct 29, 2021
Merged

Added categories on admin page #345

merged 19 commits into from
Oct 29, 2021

Conversation

eirikamb
Copy link
Contributor

Added a transitional menu to choose between admin panel and editing categories or questions

Copy link
Member

@ddabble ddabble left a comment

Choose a reason for hiding this comment

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

Very nice overall! Left a few comments below 😄

faq/forms.py Outdated Show resolved Hide resolved
faq/static/faq/css/faq_admin_list.css Outdated Show resolved Hide resolved
faq/templates/faq/admin_category_edit.html Outdated Show resolved Hide resolved
faq/templates/faq/admin_category_edit.html Outdated Show resolved Hide resolved
faq/templates/faq/admin_category_list.html Outdated Show resolved Hide resolved
faq/views.py Outdated Show resolved Hide resolved
faq/views.py Outdated Show resolved Hide resolved
faq/views.py Outdated Show resolved Hide resolved
faq/views.py Outdated Show resolved Hide resolved
faq/views.py Outdated Show resolved Hide resolved
@eirikamb
Copy link
Contributor Author

I plan to use the next meetings to abstract the admin_x_list files, but first I pushed the simple changes.

@codecov
Copy link

codecov bot commented Apr 12, 2021

Codecov Report

Merging #345 (0ae0d1f) into dev (0a19afd) will increase coverage by 0.33%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##              dev     #345      +/-   ##
==========================================
+ Coverage   83.53%   83.86%   +0.33%     
==========================================
  Files         118      118              
  Lines        3795     3862      +67     
==========================================
+ Hits         3170     3239      +69     
+ Misses        625      623       -2     
Impacted Files Coverage Δ
faq/urls.py 100.00% <ø> (ø)
make_queue/models/machine.py 88.28% <ø> (ø)
faq/forms.py 100.00% <100.00%> (ø)
faq/models.py 100.00% <100.00%> (ø)
faq/views.py 100.00% <100.00%> (ø)
make_queue/templatetags/reservation_extra.py 96.66% <0.00%> (+3.33%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0a19afd...0ae0d1f. Read the comment docs.

…-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
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.
They now lead to their respective admin list pages, instead of the FAQ admin panel.
@ddabble ddabble force-pushed the feature/faq-categories-admin branch from 6631e22 to 0ae0d1f Compare October 29, 2021 02:52
@ddabble ddabble merged commit ae2d774 into dev Oct 29, 2021
@ddabble ddabble deleted the feature/faq-categories-admin branch October 29, 2021 02:57
@ddabble ddabble mentioned this pull request Oct 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants