Skip to content

ui: ignore missing profile attribute in dev admin (bug 2019496) #951

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

Draft
shtrom wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −37
Draft

ui: ignore missing profile attribute in dev admin (bug 2019496) #951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 40 additions & 36 deletions src/lando/ui/jinja2/partials/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,17 @@
</a>
</p>
{% if user_is_authenticated %}
<p class="control">
<a class="Navbar-userSettingsBtn button">
<span class="icon">
<img src="{{ request.user.profile.userinfo['picture']|avatar_url }}" />
</span>
<span>&nbsp;{{ request.user.profile.userinfo['name'] }}&nbsp;</span>
<i class="fa fa-cogs"></i>
</a>
</p>
{% if request.user.profile|default(False) %}
<p class="control">
<a class="Navbar-userSettingsBtn button">
<span class="icon">
<img src="{{ request.user.profile.userinfo['picture']|avatar_url }}" />
</span>
<span>&nbsp;{{ request.user.profile.userinfo['name'] }}&nbsp;</span>
<i class="fa fa-cogs"></i>
</a>
</p>
{% endif %}
{% endif %}
{% if user_is_authenticated and request.user.is_superuser %}
<p class="control">
Expand Down Expand Up @@ -129,33 +131,35 @@
<p class="modal-card-title">Settings</p>
<button class="Navbar-modalCancel delete"></button>
</header>
<section class="modal-card-body">
{% set api_key_is_set = false if request.user.profile.phabricator_api_key == "" else true %}
<form class="userSettingsForm"
{% if api_key_is_set %}data-phabricator_api_key=1{% endif %}>
{% set settings_form = new_settings_form() %}
{{ settings_form.phabricator_api_key.label }}
{% if api_key_is_set %}
(set)
<label class="checkbox is-pulled-right">
{{ settings_form.reset_key.label }}
{{ settings_form.reset_key }}
</label>
{% else %}
(unset)
{% endif %}
{{ settings_form.phabricator_api_key }}
{{ csrf_input }}
<ul id="phabricator_api_key_errors" class="userSettingsForm-Errors">
</ul>
<ul id="form_errors" class="userSettingsForm-Errors">
</ul>
</form>
<p>
The API key allows anybody with access to it to perform actions on your behalf.
It is important not to store your API key anywhere but here or on the Phabricator site.
</p>
</section>
{% if request.user.profile|default(False) %}
<section class="modal-card-body">
{% set api_key_is_set = false if request.user.profile.phabricator_api_key == "" else true %}
<form class="userSettingsForm"
{% if api_key_is_set %}data-phabricator_api_key=1{% endif %}>
{% set settings_form = new_settings_form() %}
{{ settings_form.phabricator_api_key.label }}
{% if api_key_is_set %}
(set)
<label class="checkbox is-pulled-right">
{{ settings_form.reset_key.label }}
{{ settings_form.reset_key }}
</label>
{% else %}
(unset)
{% endif %}
{{ settings_form.phabricator_api_key }}
{{ csrf_input }}
<ul id="phabricator_api_key_errors" class="userSettingsForm-Errors">
</ul>
<ul id="form_errors" class="userSettingsForm-Errors">
</ul>
</form>
<p>
The API key allows anybody with access to it to perform actions on your behalf.
It is important not to store your API key anywhere but here or on the Phabricator site.
</p>
</section>
{% endif %}
<footer class="modal-card-foot">
<div class="buttons">
<a class="Navbar-modalSubmit button is-success has-text-white">Save changes</a>
Expand Down
4 changes: 3 additions & 1 deletion src/lando/ui/uplift/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ def build_assessment_form(
def can_create_submission(request: WSGIRequest) -> bool:
"""Return `True` when the user can submit uplift jobs."""
return (
request.user.is_authenticated and request.user.profile.phabricator_api_key
request.user.is_authenticated
and hasattr(request.user, "profile")
and request.user.profile.phabricator_api_key
)


Expand Down