Merge branch 'master' into 132_Old_entries
This commit is contained in:
@@ -12,7 +12,6 @@ from codelist.models import KonovaCode
|
||||
from codelist.settings import CODELIST_BIOTOPES_ID, CODELIST_BIOTOPES_EXTRA_CODES_ID
|
||||
from compensation.managers import CompensationStateManager
|
||||
from konova.models import UuidModel
|
||||
from konova.utils.message_templates import COMPENSATION_STATE_REMOVED
|
||||
|
||||
|
||||
class CompensationState(UuidModel):
|
||||
|
||||
@@ -123,9 +123,16 @@
|
||||
{% include 'user/includes/team_data_modal_button.html' %}
|
||||
{% endfor %}
|
||||
<hr>
|
||||
{% for user in obj.intervention.users.all %}
|
||||
{% include 'user/includes/contact_modal_button.html' %}
|
||||
{% endfor %}
|
||||
{% if has_access %}
|
||||
{% for user in obj.users.all %}
|
||||
{% include 'user/includes/contact_modal_button.html' %}
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<span title="{% trans 'The data must be shared with you, if you want to see which other users have shared access as well.' %}">
|
||||
{% fa5_icon 'eye-slash' %}
|
||||
{{obj.users.count}} {% trans 'other users' %}
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@@ -101,9 +101,16 @@
|
||||
{% include 'user/includes/team_data_modal_button.html' %}
|
||||
{% endfor %}
|
||||
<hr>
|
||||
{% for user in obj.users.all %}
|
||||
{% include 'user/includes/contact_modal_button.html' %}
|
||||
{% endfor %}
|
||||
{% if has_access %}
|
||||
{% for user in obj.users.all %}
|
||||
{% include 'user/includes/contact_modal_button.html' %}
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
<span title="{% trans 'The data must be shared with you, if you want to see which other users have shared access as well.' %}">
|
||||
{% fa5_icon 'eye-slash' %}
|
||||
{{obj.users.count}} {% trans 'other users' %}
|
||||
</span>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user