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

Merge of #9617: two modes now implemented 'requiredOff' and 'requiredOffButMark'.

parent 075bd7ae
Pipeline #2782 canceled with stages
...@@ -600,7 +600,7 @@ class BuildFormBootstrap extends AbstractBuildForm { ...@@ -600,7 +600,7 @@ class BuildFormBootstrap extends AbstractBuildForm {
} }
if ($formModeGlobal == F_MODE_REQUIRED_OFF_BUT_MARK || $formModeGlobal == F_MODE_REQUIRED_OFF) { if ($formModeGlobal == F_MODE_REQUIRED_OFF_BUT_MARK || $formModeGlobal == F_MODE_REQUIRED_OFF) {
$attribute[DATA_SKIP_REQUIRED_CHECK] = 'true'; $attribute[DATA_REQUIRED_OFF_BUT_MARK] = 'true';
} }
if (isset($this->formSpec[F_SAVE_BUTTON_ACTIVE]) && $this->formSpec[F_SAVE_BUTTON_ACTIVE] != '0') { if (isset($this->formSpec[F_SAVE_BUTTON_ACTIVE]) && $this->formSpec[F_SAVE_BUTTON_ACTIVE] != '0') {
......
...@@ -836,7 +836,7 @@ const API_ANSWER_REDIRECT_URL_SKIP_HISTORY = 'url-skip-history'; ...@@ -836,7 +836,7 @@ const API_ANSWER_REDIRECT_URL_SKIP_HISTORY = 'url-skip-history';
const API_TYPEAHEAD_KEY = 'key'; const API_TYPEAHEAD_KEY = 'key';
const API_TYPEAHEAD_VALUE = 'value'; const API_TYPEAHEAD_VALUE = 'value';
const DATA_SKIP_REQUIRED_CHECK = 'data-skip-required-check'; const DATA_REQUIRED_OFF_BUT_MARK = 'data-required-off-but-mark';
const DATA_HIDDEN = 'data-hidden'; const DATA_HIDDEN = 'data-hidden';
const DATA_DISABLED = 'data-disabled'; const DATA_DISABLED = 'data-disabled';
......
...@@ -224,7 +224,7 @@ class QuickFormQuery { ...@@ -224,7 +224,7 @@ class QuickFormQuery {
} }
/** /**
* Main entrypoint for display content: a) form and/or b) report * Main entry point to display content: a) form and/or b) report
* *
* @return string * @return string
* @throws \CodeException * @throws \CodeException
......
Markdown is supported
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