ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Added AlertAction and fixed enum selection issues on the frontend

Browse source
This commit is contained in:
Ziver Koc 2023-01-06 00:16:45 +01:00
parent 0efa7320e3
commit b5ac492414
7 changed files with 91 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hal-core/resource/resource/web/api/openapi.json
View file

@ -170,7 +170,7 @@
"min",
"hour",
"day",
"week",
"week"
]
},
"in": "query",

43
hal-core/resource/resource/web/js/hal.js vendored
View file

@ -153,8 +153,9 @@ function initDynamicModalForm(modalId, formTemplateId = null, templateID = null)
if (formTemplateId != null) {
dynamicConf[formTemplateId] = [];
$("#" + templateID + " div").each(function(){
dynamicConf[formTemplateId][$(this).attr("id")] = $(this).html();
dynamicConf[formTemplateId][$(this).prop("id")] = $(this).html();
});
// Update dynamic inputs
$("#" + modalId + " select[name=type]").change(function(){
$("#" + modalId + " #" + formTemplateId).html(dynamicConf[formTemplateId][$(this).val()]);
@ -170,26 +171,36 @@ function initDynamicModalForm(modalId, formTemplateId = null, templateID = null)
if (formTemplateId != null)
modal.find("#" + formTemplateId).empty(); // clear form div
// select dynamic form
var selector = modal.find("select[name=type]");
selector.val(button.data("type"));
selector.change(); // Update dynamic inputs
// set dynamic form data
$.each(button.attr(), function(fieldName, value) {
if(fieldName.startsWith("data-")) {
fieldName = fieldName.substring(5);
fieldName = fieldName.substring(5); // remove prefix data-
// case insensitive search
input = modal.find("input").filter(function() {
return this.name.toLowerCase() == fieldName;
var input = modal.find("input, select").filter(function() {
if (this.name.toLowerCase() == fieldName) {
if (this.type == "hidden" && modal.find("input[type=checkbox][name=" + fieldName + "]") != null)
return false; // Workaround for the default(false) boolean input
return true;
}
return false;
});
if (input.attr("type") == "checkbox") { // special handling for checkboxes
input.attr("value", "true");
if (value=="true") input.attr("checked", "true");
else input.removeAttr("checked");
// Add default false value as a unchecked checkbox is not included in the post
input.parent().prepend("<input type='hidden' name='" + input.attr("name") + "' value='false' />");
} else {
input.val(value);
if (input != null) {
if (input.prop("type") == "checkbox") { // special handling for checkboxes
input.prop("value", "true");
input.prop("checked", value == "true");
if (modal.find("input[type=hidden][name=" + fieldName + "]") == null) {
// Add default false value as a unchecked checkbox is not included in the post
input.parent().prepend("<input type='hidden' name='" + input.prop("name") + "' value='false' />");
}
} else {
input.val(value);
if (input.prop("tagName") == "SELECT")
input.change(); // required for select elements to update properly
}
}
}
});

26
hal-core/resource/resource/web/trigger.tmpl
View file

@ -14,15 +14,23 @@
<div class="panel panel-default drop-shadow">
<div class="panel-heading clearfix" style="padding: 4px 15px;">
<b class="panel-title">{{.getName()}}</b>
<div class="pull-right">
<button type="button" class="btn btn-default btn-xs" data-toggle="modal" style="padding: 1px 20px;"
data-target="#flowModal"
data-flow-id="{{.getId()}}"
data-enabled="{{.isEnabled()}}"
data-name="{{.getName()}}" >
<span class="glyphicon glyphicon-pencil"></span>
</button>
</div>
<form method="POST">
<input type="hidden" name="flow-id" value="{{.getId()}}">
<div class="btn-toolbar pull-right">
<button type="submit" class="btn btn-primary btn-xs" name="action" value="execute_flow">
<small class="glyphicon glyphicon-play"></small>
</button>
<button type="button" class="btn btn-default btn-xs" data-toggle="modal" style="padding: 1px 20px;"
data-target="#flowModal"
data-flow-id="{{.getId()}}"
data-enabled="{{.isEnabled()}}"
data-name="{{.getName()}}" >
<span class="glyphicon glyphicon-pencil"></span>
</button>
</div>
</form>
</div>
<div class="panel-body {{^.isEnabled()}}disabled{{/.isEnabled()}}" style="padding-bottom: 0px;">
<table class="table table-condensed" style="margin-bottom: 0px;">