Projet

Général

Profil

0001-backoffice-move-multi-action-checkbox-after-critical.patch

Frédéric Péters, 23 septembre 2019 11:23

Télécharger (3,45 ko)

Voir les différences:

Subject: [PATCH] backoffice: move multi action checkbox after criticality/lock
 (#36342)

 wcs/forms/backoffice.py             | 16 ++++++++--------
 wcs/qommon/static/css/dc2/admin.css | 10 ++++++++--
 2 files changed, 16 insertions(+), 10 deletions(-)
wcs/forms/backoffice.py
81 81
        using_postgresql = get_publisher().is_using_postgresql()
82 82

  
83 83
        r += htmltext('<thead><tr>')
84
        if self.formdef.workflow.criticality_levels and using_postgresql:
85
            r += htmltext('<th class="criticality-level-cell" data-field-sort-key="criticality_level"><span></span></th>')
86
        else:
87
            r += htmltext('<th></th>') # lock
84 88
        if include_checkboxes:
85 89
            r += htmltext('<th class="select"><input type="checkbox" name="select[]" value="_all"/>')
86 90
            r += htmltext(' <span id="info-all-rows">%s</span></th>') % _(
87 91
                    'Do note the selected action will run on all pages when this is checked.')
88
        if self.formdef.workflow.criticality_levels and using_postgresql:
89
            r += htmltext('<th style="width: 4ex;" data-field-sort-key="criticality_level"><span></span></th>')
90
        else:
91
            r += htmltext('<th></th>') # lock
92 92
        for f in fields:
93 93
            field_sort_key = None
94 94
            if getattr(f, 'fake', False):
......
245 245
            if filled.anonymised:
246 246
                data += ' data-anonymised="true"'
247 247
            r += htmltext('<tr class="%s"%s>' % (' '.join(classes), data))
248
            if include_criticality_level:
249
                r += htmltext('<td class="criticality-level-cell" %s></td>' % style) # criticality_level
250
            else:
251
                r += htmltext('<td class="lock-cell"></td>') # lock
248 252
            if include_checkboxes:
249 253
                r += htmltext('<td class="select"><input type="checkbox" name="select[]" ')
250 254
                r += htmltext('value="%s"') % filled.id
......
257 261
                    if function_value in user.get_roles():
258 262
                        r += htmltext(' data-is-%s="true" ' % function_key)
259 263
                r += htmltext('/></td>')
260
            if include_criticality_level:
261
                r += htmltext('<td %s></td>' % style) # criticality_level
262
            else:
263
                r += htmltext('<td></td>') # lock
264 264
            for i, f in enumerate(fields):
265 265
                field_value = filled.get_field_view_value(f, max_length=30)
266 266
                if f.type == 'id':
wcs/qommon/static/css/dc2/admin.css
427 427
	background: #dde;
428 428
}
429 429

  
430
#listing.main th,
431
#listing.main td {
430
table.main th,
431
table.main td {
432 432
	text-align: left;
433 433
}
434 434

  
......
507 507
	opacity: 0.5;
508 508
}
509 509

  
510
table.main .lock-cell,
511
table.main .criticality-level-cell {
512
	text-align: center;
513
	width: 1rem;
514
}
515

  
510 516
tr.advisory-lock td:first-child::before {
511 517
	font-family: FontAwesome;
512 518
	content: "\f023"; /* lock */
513
-