Projet

Général

Profil

0001-backoffice-show-an-slashed-eye-next-to-user-hidden-s.patch

Frédéric Péters, 31 août 2019 20:30

Télécharger (4,34 ko)

Voir les différences:

Subject: [PATCH] backoffice: show an slashed eye next to user hidden statuses
 (#34919)

 tests/test_form_pages.py                |  2 ++
 wcs/backoffice/management.py            |  6 +++++-
 wcs/qommon/static/css/dc2/admin.css     | 14 ++++++++++++++
 wcs/templates/wcs/formdata_history.html |  8 ++++++--
 4 files changed, 27 insertions(+), 3 deletions(-)
tests/test_form_pages.py
3713 3713
    resp = resp.form.submit('button_export_to')
3714 3714
    resp = resp.follow()
3715 3715
    assert 'Form exported in a model' in resp.body
3716
    assert 'visibility-off' in resp.body
3716 3717

  
3717 3718
    resp = resp.form.submit('button_jump2')
3718 3719
    resp = resp.follow()
......
3726 3727

  
3727 3728
    resp = login(get_app(pub), username='foo', password='foo').get(resp.request.url)
3728 3729
    assert not 'Form exported in a model' in resp.body
3730
    assert 'visibility-off' not in resp.body
3729 3731

  
3730 3732
def test_formdata_form_file_download(pub):
3731 3733
    create_user(pub)
wcs/backoffice/management.py
2116 2116

  
2117 2117
            r += htmltext('<p class="current-status"><span class="item" style="background: #%s; color: %s;"></span>' %
2118 2118
                    (status_colour, fg_colour))
2119
            r += htmltext('<span>%s %s</span></p>') % (_('Status:'), formdata.get_status_label())
2119
            r += htmltext('<span>%s %s') % (_('Status:'), formdata.get_status_label())
2120
            if formdata.get_status().get_visibility_restricted_roles():
2121
                r += htmltext('<span class="visibility-off" title="%s"></span>') % _(
2122
                        'This status is not visible to users.')
2123
            r += htmltext('</span></p>')
2120 2124
            if formdata.formdef.workflow.criticality_levels:
2121 2125
                try:
2122 2126
                    level = formdata.get_criticality_level_object()
wcs/qommon/static/css/dc2/admin.css
1456 1456
	line-height: 130%;
1457 1457
}
1458 1458

  
1459
p.current-status span.visibility-off {
1460
	display: inline;
1461
	height: auto;
1462
}
1463

  
1464
span.visibility-off::after {
1465
	cursor: help;
1466
	margin-left: 1rem;
1467
	content: "\f070";  /* fa-eye-slash */
1468
	font-family: FontAwesome;
1469
	font-weight: normal;
1470
	color: #3c3c33;
1471
}
1472

  
1459 1473
p.current-level .item,
1460 1474
p.current-status .item {
1461 1475
	float: left;
wcs/templates/wcs/formdata_history.html
7 7
    {% with status=evolution.get_status display_parts=evolution.display_parts %}
8 8
    <li class="{% if evolution.who == '_submitter' %}msg-in{% elif evolution.who %}msg-out{% else %}msg-system{% endif %}
9 9
               {% if status.is_endpoint %}endpoint{% endif %}
10
               {{ status.extra_css_class }}">
10
               {{ status.extra_css_class|default:"" }}">
11 11
      <span class="item {% if not evolution.status %}no-status-change{% endif %}" style="background: #{{ status.colour }}; color: {{ status.get_contrast_color}}"></span>
12 12
      <div>
13 13
       {% if evolution.status %}
14 14
         <div class="evolution-metadata">
15
           <span class="status">{{evolution.get_status_label}}</span>
15
           <span class="status">{{evolution.get_status_label}}
16
             {% if status.get_visibility_restricted_roles %}
17
             <span title="{% trans "This status is not visible to users" %}" class="visibility-off"></span>
18
             {% endif %}
19
           </span>
16 20
           <span class="time">{{evolution.datetime}}
17 21
             {% if evolution.last_jump_datetime and user.is_admin %}
18 22
             <span class="last-jump">({% trans "last check:" %} {{ evolution.last_jump_datetime }})</span>
19
-