Merge master
This commit is contained in:
@@ -108,10 +108,11 @@ def note_accessibility(
|
|||||||
"""
|
"""
|
||||||
accessibility for note tab
|
accessibility for note tab
|
||||||
"""
|
"""
|
||||||
if request.user.has_perm("employee.view_employeenote") or check_manager(
|
if instance.employee_user_id != request.user or request.user.is_superuser:
|
||||||
request.user.employee_get, instance
|
if request.user.has_perm("employee.view_employeenote") or check_manager(
|
||||||
):
|
request.user.employee_get, instance
|
||||||
return True
|
):
|
||||||
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -79,21 +79,24 @@
|
|||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="oh-input__group">
|
<div class="form-group mt-2">
|
||||||
<div class="oh-tabs__view-buttons mt-2">
|
<label for="body"><h6>{% trans "Message Body" %}</h6></label>
|
||||||
<span class="tab-btn active" data-tab="write">
|
<div class="oh-input__group">
|
||||||
<span>{% trans 'Write' %}</span>
|
<div class="oh-tabs__view-buttons mt-2">
|
||||||
</span>
|
<span class="tab-btn active" data-tab="write">
|
||||||
<span class="tab-btn" data-tab="preview" hx-on:click="$('#previewHxButton').click();">
|
<span>{% trans 'Write' %}</span>
|
||||||
<span>{% trans 'Preview' %}</span>
|
</span>
|
||||||
</span>
|
<span class="tab-btn" data-tab="preview" hx-on:click="$('#previewHxButton').click();">
|
||||||
</div>
|
<span>{% trans 'Preview' %}</span>
|
||||||
<div id="write" class="oh-tabs__view active">
|
</span>
|
||||||
<textarea id="writeField" class="oh-input oh-input--textarea" hidden name="body"
|
</div>
|
||||||
data-summernote required placeholder="Type something here..."></textarea>
|
<div id="write" class="oh-tabs__view active">
|
||||||
</div>
|
<textarea id="writeField" class="oh-input oh-input--textarea" hidden name="body"
|
||||||
<div id="preview" class="oh-tabs__view">
|
data-summernote required placeholder="Type something here..."></textarea>
|
||||||
<textarea id="previewField" class="oh-input oh-input--textarea" placeholder="preview..."></textarea>
|
</div>
|
||||||
|
<div id="preview" class="oh-tabs__view">
|
||||||
|
<textarea id="previewField" class="oh-input oh-input--textarea" placeholder="preview..."></textarea>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{% if cand %}
|
{% if cand %}
|
||||||
@@ -189,10 +192,18 @@
|
|||||||
data: { "candidate_id": "{{cand.id}}" },
|
data: { "candidate_id": "{{cand.id}}" },
|
||||||
dataType: "Json",
|
dataType: "Json",
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
$(`#objectCreateModalTarget [name="body"]`).html(response.body).change();
|
|
||||||
$(`#objectCreateModalTarget [class="note-editable"]`).html(response.body);
|
// Update Summernote value correctly
|
||||||
$('#previewHxButton').click();
|
if ($('#writeField').next('.note-editor').length) {
|
||||||
|
$('#writeField').summernote('code', response.body);
|
||||||
|
} else {
|
||||||
|
// Fallback if summernote not initialized yet
|
||||||
|
$('#writeField').val(response.body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Trigger preview refresh
|
||||||
|
$('#previewHxButton').click();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user