-
Notifications
You must be signed in to change notification settings - Fork 3
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
Create user list view #69
Merged
Merged
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
6a09ce4
Add additional role
rmarow 95f963a
Add user view with table
rmarow 5b21282
Remove else statement
rmarow 0f08df5
Update where user list shows
rmarow 3a3a055
Add warning for non admin attempting to access user list
rmarow 97a6cee
Rename macro file
rmarow 1752c1f
Update message page for users not logged in.
rmarow File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
ROLES = [ | ||
'admin', | ||
# 'respondent', | ||
'respondent', | ||
# 'analyst', | ||
] |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
from flask import render_template | ||
|
||
from usaon_vta_survey import app | ||
from usaon_vta_survey.models.tables import User | ||
|
||
|
||
@app.route('/users') | ||
def view_users(): | ||
users = User.query.order_by(User.name).all() | ||
return render_template( | ||
'users.html', | ||
users=users, | ||
) |
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
15 changes: 15 additions & 0 deletions
15
usaon_vta_survey/templates/macros/login_button_or_private_nav_buttons.j2
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
{% macro user_login_buttons(current_user) -%} | ||
{% if current_user.is_authenticated %} | ||
{% if current_user.role=='admin' %} | ||
<a href="{{url_for('profile', user_id=current_user.id)}}">Profile</a> | ||
<a href="{{url_for('view_users')}}">Users</a> | ||
<a href="{{url_for('logout')}}">Logout</a> | ||
{% else %} | ||
<a href="{{url_for('profile', user_id=current_user.id)}}">Profile</a> | ||
<a href="{{url_for('logout')}}">Logout</a> | ||
{% endif %} | ||
{% else %} | ||
<a href="{{url_for('login')}}">Login</a> | ||
{% endif %} | ||
|
||
{%- endmacro -%} |
9 changes: 0 additions & 9 deletions
9
usaon_vta_survey/templates/macros/user_login_management_buttons.j2
This file was deleted.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
{% extends 'base.html' %} | ||
|
||
|
||
{% block content %} | ||
<h2>{% block title %}Users{% endblock %}</h1> | ||
|
||
{% if not current_user.role=='admin' %} | ||
<h3>You don't belong here! This page is for admins only.</h3> | ||
{% else %} | ||
<table> | ||
|
||
<tr> | ||
<th>id</th> | ||
<th>Name</th> | ||
<th>Role</th> | ||
<th>Affiliation</th> | ||
<th>Bio</th> | ||
|
||
{% for user in users %} | ||
<tr> | ||
<td>{{user.id}} </td> | ||
<td>{{user.name}}</td> | ||
<td>{{user.role}}</td> | ||
<td>{{user.affiliation}}</td> | ||
<td>{{user.biography}}</td> | ||
</tr> | ||
{% endfor %} | ||
|
||
</table> | ||
{% endif %} | ||
{% endblock %} |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this work as expected for logged out users? I'd expect an error like
undefined has no attribute 'role'
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Updated this to reflect that.