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

[UPDT] HORILLA AUTOMATIONS: Optimize form submit handler for #{{view_id}}Form:

Browse Source
This commit is contained in:
Horilla
2025-08-13 16:33:29 +05:30
parent b0dd68db94
commit 226aebc3a1
2 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
horilla_automations/forms.py
View File

@@ -84,13 +84,16 @@ class AutomationForm(ModelForm):
# --- Field: mail_template ---
self.fields["mail_template"].empty_label = "----------"
# --- Instance condition fields ---
if self.instance.pk:
self.fields["condition"].initial = self.instance.condition_html
self.fields["condition_html"].initial = self.instance.condition_html
self.fields["condition_querystring"].initial = (
self.instance.condition_querystring
)
# --- Field: condition fields ---
self.fields["condition"].initial = getattr(
self.instance, "condition", None
) or self.data.get("condition")
self.fields["condition_html"].initial = getattr(
self.instance, "condition_html", None
) or self.data.get("condition_html")
self.fields["condition_querystring"].initial = getattr(
self.instance, "condition", None
) or self.data.get("condition_html")
# --- Apply option template name for all select fields ---
for field in self.fields.values():

23
horilla_automations/templates/horilla_automations/automation_form.html
View File

@@ -8,16 +8,21 @@
$(this).closest('.oh-accordion').toggleClass('oh-accordion--show');
});
$("#{{view_id}} form button").click(function (e) {
const form = document.getElementById('multipleConditionForm');
const elements = form.elements;
const queryString = Array.from(elements)
.filter(element => element.name && !element.disabled)
.map(element => encodeURIComponent(element.name) + '=' + encodeURIComponent(element.value))
$(document).on('click', '#{{view_id}}Form button[type="submit"]', function () {
const $mainForm = $('#{{view_id}}Form');
const conditionFormEl = $('#multipleConditionForm')[0];
if (!conditionFormEl) return;
const queryString = Array.from(conditionFormEl.elements)
.filter(el => el.name && !el.disabled)
.map(el => encodeURIComponent(el.name) + '=' + encodeURIComponent(el.value))
.join('&');
$("#{{view_id}} form [name=condition_querystring]").val(queryString);
html = $(".note-editable #multipleConditionForm").html()
$("#{{view_id}} form [name=condition_html]").val(html);
$mainForm.find('[name="condition_querystring"]').val(queryString);
const html = $(".note-editable #multipleConditionForm").html();
$mainForm.find('[name="condition_html"]').val(html);
});
$("#dynamic_field_condition").parent().removeClass("col-md-6");