Commit f62c8a8d authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'B13507FunctionShouldWorkWithoutSql=' into 'develop'

fixed execute function without 'sql=' in Syntax

See merge request !372
parents 4a1f5f06 4fbcd28d
Pipeline #6591 passed with stages
in 2 minutes and 59 seconds
......@@ -1340,7 +1340,11 @@ abstract class AbstractBuildForm {
$elementCharacterCount = '';
if (isset($formElement[FE_INPUT_CLEAR_ME]) && $formElement[FE_INPUT_CLEAR_ME] != '0') {
$class .= ' qfq-clear-me';
if (isset($this->formSpec["multiMode"]) && $this->formSpec["multiMode"] == 'vertical'){
$class .= ' qfq-clear-me-multiform';
}else {
$class .= ' qfq-clear-me';
}
}
if ($formElement[FE_MAX_LENGTH] > 0 && $value !== '') {
......
......@@ -139,6 +139,7 @@ class QuickFormQuery {
// set dummy values if QuickFormQuery is not called by Typo3
$t3data[T3DATA_BODYTEXT] = $t3data[T3DATA_BODYTEXT] ?? '';
$t3data[T3DATA_UID] = $t3data[T3DATA_UID] ?? 0;
$t3data[T3DATA_SUBHEADER] = $t3data[T3DATA_SUBHEADER] ?? 0;
$t3data[T3DATA_HEADER] = $t3data[T3DATA_HEADER] ?? '';
// Read report file, if file keyword exists in bodytext
......
......@@ -330,7 +330,7 @@ class Report {
}
// set defaults
if ($frCmd === TOKEN_SQL) {
if ($frCmd === TOKEN_SQL || $frCmd === TOKEN_FUNCTION ) {
$arr = explode('|', TOKEN_VALID_LIST);
foreach ($arr as $key) {
if (!isset($this->frArray[$level . "." . $key])) {
......
......@@ -91,7 +91,42 @@ $(document).ready( function () {
});
});
$('.qfq-clear-me-multiform').each(function() {
var myInput = $(this);
if(!myInput.is("input,textarea")) {
return;
}
var closeButton = $("<span>", {
class: "qfq-clear-me-multiform-button",
html: "&times;"
});
if (myInput.val() == '' || myInput.is('[disabled=disabled]')) {
closeButton.addClass("hidden");
}
closeButton.on("click", function(e) {
myInput.val('');
closeButton.addClass("hidden");
});
$(this).after(closeButton);
$(this).on("input", function() {
if(myInput.val() != '' && !myInput.is('[disabled=disabled]')) {
closeButton.removeClass("hidden");
} else {
closeButton.addClass("hidden");
}
});
});
n.Helper.calendar();
})(QfqNS);
});
......@@ -1113,6 +1113,7 @@ span.qfq-more-text {
display: none;
}
.qfq-clear-me-button {
display: block;
right:12px;
......@@ -1125,6 +1126,23 @@ span.qfq-more-text {
cursor: pointer;
}
.qfq-clear-me-multiform-button {
display: block;
width: 4%;
margin-left: 1%;
margin-top: 5px;
font-size: 18px;
line-height: 18px;
color: #888;
cursor: pointer;
position: unset;
float: right;
}
.qfq-clear-me-multiform {
width: 95%;
float: left;
}
// Droplets
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment