Commit 84ae3e85 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Merge branch 'develop' into f11269_RESTonPOSTcustomizedAnswer

parents 859ce76f 43d4ea61
Pipeline #4028 passed with stages
in 5 minutes and 59 seconds
......@@ -432,6 +432,15 @@ EOF;
// LOCK
if (!$skip && HelperFormElement::booleParameter($formElement[FE_INPUT_EXTRA_BUTTON_LOCK] ?? '-')) {
switch ($formElement[FE_TYPE]) {
case FE_TYPE_SELECT:
$extraButton .= <<<EOF
<button class="btn btn-info"
onclick="$('#$id').toggleClass('qfq-disabled')">
<span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
</button>
<script>$('#$id').addClass('qfq-disabled')</script>
EOF;
break;
case FE_TYPE_CHECKBOX:
case FE_TYPE_RADIO:
$extraButton .= <<<EOF
......@@ -439,6 +448,7 @@ EOF;
onclick="$('[id^=$id]').parent('label').toggleClass('qfq-disabled')">
<span class="glyphicon glyphicon-lock" aria-hidden="true"></span>
</button>
<script>$('[id^=$id]').parent('label').addClass('qfq-disabled')</script>
EOF;
break;
default:
......
......@@ -1913,8 +1913,11 @@ class QuickFormQuery {
throw new \UserReportException("Name too long (max. 64 characters).", ERROR_TABLESORTER_NAME_TOO_LONG);
}
// The $view is base64 encoded.
// The $view is base64 encoded. javascript base64 Alphabet: "A-Z", "a-z", "0-9", "+", "/" and "="
$view = Store::getVar(SETTING_TABLESORTER_VIEW, STORE_CLIENT, SANITIZE_ALLOW_ALLBUT);
if (preg_match("#^[A-Za-z0-9+/=]*$#", $view)) {
throw new \UserReportException("Encoding error of table data. This should not happen. Please contact support.", ERROR_TABLESORTER_INVALID_CHAR);
}
$rows = $this->dbArray[$this->dbIndexQfq]->sql(
'SELECT `sett`.`id`, `sett`.`readonly` FROM `' . SETTING_TABLE_NAME . '` AS sett WHERE `tableId`=? AND `name`=? AND IF(?, public, feUser=? AND !public)',
......
......@@ -167,6 +167,7 @@ i.@{spinner_class} {
.qfq-disabled {
cursor: not-allowed !important;
pointer-events: none !important;
background: #eee !important;
}
......
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