fix: tweak review assignment tooltips and control row height (#3788)
This commit is contained in:
parent
6867b1b667
commit
db254f7a48
|
@ -13,22 +13,36 @@ $(function () {
|
||||||
|
|
||||||
function setControlDisplay (row) {
|
function setControlDisplay (row) {
|
||||||
const action = row.find('[name$="-action"]').val()
|
const action = row.find('[name$="-action"]').val()
|
||||||
|
const reviewerControls = row.find('.reviewer-controls')
|
||||||
|
const reviewerButtons = reviewerControls.find('button')
|
||||||
|
const closeControls = row.find('.close-controls')
|
||||||
|
const closeButtons = reviewerControls.find('button')
|
||||||
|
const actionElements = row.find('.assign-action,.close-action')
|
||||||
|
const actionButtons = actionElements.find('button')
|
||||||
|
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case 'assign':
|
case 'assign':
|
||||||
row.find('.reviewer-controls').show()
|
reviewerControls.show()
|
||||||
row.find('.close-controls').hide()
|
closeButtons.tooltip('hide')
|
||||||
row.find('.assign-action,.close-action').hide()
|
closeControls.hide()
|
||||||
|
actionButtons.tooltip('hide')
|
||||||
|
actionElements.hide()
|
||||||
break
|
break
|
||||||
|
|
||||||
case 'close':
|
case 'close':
|
||||||
row.find('.reviewer-controls').hide()
|
reviewerButtons.tooltip('hide')
|
||||||
row.find('.close-controls').show()
|
reviewerControls.hide()
|
||||||
row.find('.assign-action,.close-action').hide()
|
closeControls.show()
|
||||||
|
actionButtons.tooltip('hide')
|
||||||
|
actionElements.hide()
|
||||||
break
|
break
|
||||||
|
|
||||||
default:
|
default:
|
||||||
row.find('.reviewer-controls,.close-controls').hide()
|
closeButtons.tooltip('hide')
|
||||||
row.find('.assign-action,.close-action').show()
|
closeControls.hide()
|
||||||
|
reviewerButtons.tooltip('hide')
|
||||||
|
reviewerControls.hide()
|
||||||
|
actionElements.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
updateSaveButtons()
|
updateSaveButtons()
|
||||||
|
|
|
@ -184,14 +184,16 @@
|
||||||
{% if r.form.review_type %}
|
{% if r.form.review_type %}
|
||||||
{% bootstrap_field r.form.review_type layout="horizontal" wrapper_class="col" size="sm" %}
|
{% bootstrap_field r.form.review_type layout="horizontal" wrapper_class="col" size="sm" %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% bootstrap_field r.form.reviewer layout="horizontal" wrapper_class="col row" size="sm" %}
|
{% bootstrap_field r.form.reviewer layout="horizontal" wrapper_class="col row" label_class="p-0" size="sm" %}
|
||||||
{% bootstrap_field r.form.add_skip layout="horizontal" wrapper_class="col col-2" size="sm" %}
|
{% bootstrap_field r.form.add_skip layout="horizontal" wrapper_class="col col-2" size="sm" %}
|
||||||
<button type="button"
|
<div class="col col-1">
|
||||||
class="btn btn-sm btn-primary undo col col-1"
|
<button type="button"
|
||||||
title="Cancel assignment"
|
class="btn btn-sm btn-primary undo"
|
||||||
data-initial="{{ r.form.fields.reviewer.initial|default:"" }}">
|
title="Cancel assignment"
|
||||||
Cancel
|
data-initial="{{ r.form.fields.reviewer.initial|default:"" }}">
|
||||||
</button>
|
Cancel
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
{% if r.form.reviewer.errors or r.form.add_skip.errors %}
|
{% if r.form.reviewer.errors or r.form.add_skip.errors %}
|
||||||
<div class="alert alert-danger my-3">
|
<div class="alert alert-danger my-3">
|
||||||
{% for e in r.form.reviewer.errors %}{{ e }}{% endfor %}
|
{% for e in r.form.reviewer.errors %}{{ e }}{% endfor %}
|
||||||
|
|
Loading…
Reference in a new issue