nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
Horilla
2025-12-15 14:53:20 +05:30
parent 2c5be977df
commit d09b58664f
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
employee/cbv/accessibility.py
View File

@@ -108,10 +108,11 @@ def note_accessibility(
"""
accessibility for note tab
"""
if request.user.has_perm("employee.view_employeenote") or check_manager(
request.user.employee_get, instance
):
return True
if instance.employee_user_id != request.user or request.user.is_superuser:
if request.user.has_perm("employee.view_employeenote") or check_manager(
request.user.employee_get, instance
):
return True
return False

47
recruitment/templates/pipeline/pipeline_components/send_mail.html
View File

@@ -79,21 +79,24 @@
</select>
</div>
<div class="oh-input__group">
<div class="oh-tabs__view-buttons mt-2">
<span class="tab-btn active" data-tab="write">
<span>{% trans 'Write' %}</span>
</span>
<span class="tab-btn" data-tab="preview" hx-on:click="$('#previewHxButton').click();">
<span>{% trans 'Preview' %}</span>
</span>
</div>
<div id="write" class="oh-tabs__view active">
<textarea id="writeField" class="oh-input oh-input--textarea" hidden name="body"
data-summernote required placeholder="Type something here..."></textarea>
</div>
<div id="preview" class="oh-tabs__view">
<textarea id="previewField" class="oh-input oh-input--textarea" placeholder="preview..."></textarea>
<div class="form-group mt-2">
<label for="body"><h6>{% trans "Message Body" %}</h6></label>
<div class="oh-input__group">
<div class="oh-tabs__view-buttons mt-2">
<span class="tab-btn active" data-tab="write">
<span>{% trans 'Write' %}</span>
</span>
<span class="tab-btn" data-tab="preview" hx-on:click="$('#previewHxButton').click();">
<span>{% trans 'Preview' %}</span>
</span>
</div>
<div id="write" class="oh-tabs__view active">
<textarea id="writeField" class="oh-input oh-input--textarea" hidden name="body"
data-summernote required placeholder="Type something here..."></textarea>
</div>
<div id="preview" class="oh-tabs__view">
<textarea id="previewField" class="oh-input oh-input--textarea" placeholder="preview..."></textarea>
</div>
</div>
</div>
{% if cand %}
@@ -189,10 +192,18 @@
data: { "candidate_id": "{{cand.id}}" },
dataType: "Json",
success: function (response) {
$(`#objectCreateModalTarget [name="body"]`).html(response.body).change();
$(`#objectCreateModalTarget [class="note-editable"]`).html(response.body);
$('#previewHxButton').click();
// Update Summernote value correctly
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();
}
});
}
}