Skip to content
Snippets Groups Projects
Commit 07dc55c9 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '386-admin-cannot-unfinish-visit' into 'devel_1.0.x'

Resolve "admin cannot unfinish visit"

See merge request NCER-PD/scheduling-system!309
parents 56c56f7c cf66fc2c
No related branches found
No related tags found
3 merge requests!316Merge 1.0.1,!3151.0.1 into master,!309Resolve "admin cannot unfinish visit"
Pipeline #38443 passed
smasch (1.0.1-1) stable; urgency=low
* bug fix: unfinish visit button was always disabled (#386)
* bug fix: generating documents for templates did not work for subjects
created before custom field was added to the study (#388)
......
......@@ -70,7 +70,7 @@
<div class="col-md-6 form-group">
<label class="col-sm-4 control-label">
{% if visFinished %}
<i title="Only visits with one inmediate future visit (without appointments) can be unfinished." class="fa fa-info-circle"></i>
<i title="Only visits with one immediate future visit (without appointments) can be unfinished." class="fa fa-info-circle"></i>
{% endif %}
Visit finished
</label>
......@@ -95,7 +95,7 @@
{% if visFinished %}
<div class="col-sm-1">
{% if "unfinish_visit" not in permissions %}
{% if "delete_visit" not in permissions %}
<div title="You don't have permissions to unfinish visits." class="btn btn-block btn-warning disabled">
<i class="fa fa-undo"></i>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment