darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-04 17:38:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename confusing property

Browse Source 
It’s more about the multiple different types of things they can see, not
just that there are multiple things.
This commit is contained in:
Chris Hill-Scott
2019-06-13 13:40:29 +01:00
parent 53f5ebdd48
commit edba0c7f5f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.py
View File

@@ -319,7 +319,7 @@ class User(JSONModel, UserMixin):
return None return None
@property @property
def has_multiple_services_or_organisations(self): def has_access_to_live_and_trial_mode_services(self):
return ( return (
self.organisations or self.live_services self.organisations or self.live_services
) and ( ) and (

8
app/templates/views/choose-account.html
View File

@@ -53,11 +53,11 @@
{% block maincolumn_content %} {% block maincolumn_content %}
<h1 class="heading-large {% if current_user.has_multiple_services_or_organisations %}visually-hidden{% endif %}"> <h1 class="heading-large {% if current_user.has_access_to_live_and_trial_mode_services %}visually-hidden{% endif %}">
Choose service Choose service
</h1> </h1>
<nav class="browse-list {% if current_user.has_multiple_services_or_organisations %}top-gutter-2-3{% endif %}"> <nav class="browse-list {% if current_user.has_access_to_live_and_trial_mode_services %}top-gutter-2-3{% endif %}">
{% if current_user.platform_admin %} {% if current_user.platform_admin %}
<div class="grid-row"> <div class="grid-row">
@@ -102,7 +102,7 @@
{% if can_add_service %} {% if can_add_service %}
<div class="js-stick-at-bottom-when-scrolling"> <div class="js-stick-at-bottom-when-scrolling">
{% if current_user.has_multiple_services_or_organisations %} {% if current_user.has_access_to_live_and_trial_mode_services %}
<div class="grid-row"> <div class="grid-row">
<div class="column-one-quarter"> <div class="column-one-quarter">
&nbsp; &nbsp;
@@ -110,7 +110,7 @@
<div class="column-three-quarters"> <div class="column-three-quarters">
{% endif %} {% endif %}
<a href="{{ url_for('.add_service') }}" class="button-secondary">Add a new service</a> <a href="{{ url_for('.add_service') }}" class="button-secondary">Add a new service</a>
{% if current_user.has_multiple_services_or_organisations %} {% if current_user.has_access_to_live_and_trial_mode_services %}
</div> </div>
</div> </div>
{% endif %} {% endif %}