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.

Sign up for GitHub

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

Jump to bottom

fix #1333 #1667

Merged
merged 14 commits into from
Apr 22, 2022
Merged

fix #1333 #1667

merged 14 commits into from
Apr 22, 2022

Conversation

lill28
Copy link
Collaborator

@lill28 lill28 commented Nov 15, 2021

No description provided.

@richardebeling richardebeling linked an issue Nov 17, 2021 that may be closed by this pull request
Redesign user index #1333
Closed
richardebeling
richardebeling requested changes Nov 17, 2021
View reviewed changes
Copy link
Member

@richardebeling richardebeling left a comment

Choose a reason for hiding this comment

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

Cool, this has very nice solutions to a lot of problems you seem to already have encountered and solved. Good job!

evap/staff/templates/staff_user_form.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_index.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_index.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_index.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_list.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_list.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_list.html Outdated Show resolved Hide resolved
evap/staff/views.py Outdated Show resolved Hide resolved
evap/staff/views.py Show resolved Hide resolved
evap/staff/views.py Show resolved Hide resolved
janno42
janno42 requested changes Nov 22, 2021
View reviewed changes
evap/staff/templates/staff_user_index.html Show resolved Hide resolved
evap/staff/templates/staff_user_form.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_form.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_form.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_form.html Outdated Show resolved Hide resolved
evap/staff/templates/staff_user_form.html Show resolved Hide resolved
evap/staff/templates/staff_user_list.html Outdated Show resolved Hide resolved
@richardebeling richardebeling mentioned this pull request Mar 15, 2022
Closed
niklasmohrin
niklasmohrin reviewed Mar 21, 2022
View reviewed changes
Copy link
Member

@niklasmohrin niklasmohrin left a comment

Choose a reason for hiding this comment

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

Works very nicely!

evap/staff/templates/staff_user_index.html Show resolved Hide resolved
evap/staff/views.py Outdated Show resolved Hide resolved
evap/staff/views.py Outdated Show resolved Hide resolved
@janno42
Copy link
Member

janno42 commented Mar 25, 2022

just reformating left (you can simply use python manage.py format) and i think then we're done here :)

janno42
janno42 approved these changes Apr 4, 2022
View reviewed changes
Copy link
Member

@janno42 janno42 left a comment

Choose a reason for hiding this comment

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

✔️ Meets requirements
✔️ UI functionality checked

@janno42 janno42 requested a review from richardebeling April 4, 2022 17:00
richardebeling
richardebeling reviewed Apr 4, 2022
View reviewed changes
Copy link
Member

@richardebeling richardebeling left a comment

Choose a reason for hiding this comment

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

cdd0c81 is named " Change TestUserIndexView to TestUserListView and write new TestUserIndexView" but only does the renaming, and doesn't add the new test. Is it possible that you forgot to git add your changes or something?

richardebeling
richardebeling approved these changes Apr 18, 2022
View reviewed changes
Copy link
Member

@richardebeling richardebeling left a comment

Choose a reason for hiding this comment

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

Thanks! :)

@richardebeling
Copy link
Member

There are merge conflicts in staff_user_index -- would you like to resolve them yourself, or should we do that?

@richardebeling richardebeling merged commit e0824df into e-valuation:main Apr 22, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@niklasmohrin niklasmohrin niklasmohrin approved these changes

@richardebeling richardebeling richardebeling approved these changes

@janno42 janno42 janno42 approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Redesign user index
4 participants
@lill28 @janno42 @richardebeling @niklasmohrin