Skip to content

Commit 60c3c18

Browse files
committed
Merge branch 'dev' into version-3-0-alpha
2 parents ba21834 + 3c591fe commit 60c3c18

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

tom_common/templates/tom_common/partials/navbar_login.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,13 @@
99
{% endif %}
1010
</li>
1111
<li>
12-
<a class="btn btn-outline-success" title="logout" href="{% url 'logout' %}">Logout</a>
12+
<form method="post" action="{% url 'logout' %}">
13+
{% csrf_token %}
14+
<button class="btn btn-outline-success" title="Logout" type="submit">Logout</button>
15+
</form>
1316
</li>
1417
{% else %}
1518
<li class="nav-item">
16-
<a class="btn btn-outline-success" title="logout" href="{% url 'login' %}">Login</a>
19+
<a class="btn btn-outline-success" title="Login" href="{% url 'login' %}">Login</a>
1720
</li>
1821
{% endif %}

tom_observations/facilities/lco_redirect.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,6 @@ def request_id_to_group(self, observation_id, user, target, parameters):
122122
observation_group.observation_records.add(obs_record)
123123

124124
return observation_group
125+
126+
def get_facility_status(self):
127+
return self.lco_facility.get_facility_status()

0 commit comments

Comments
 (0)