Commit 86bec8a7 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fixe some small error messages.

parent 7de0cae8
Pipeline #1107 passed with stage
in 1 minute and 43 seconds
......@@ -218,13 +218,13 @@ class BuildFormBootstrap extends AbstractBuildForm {
$baseUrl = 'p:' . $pageAlias . '&form=' . $this->formSpec[F_NAME];
$baseMisc = '|b|G:glyphicon-bell|s|c:btn btn-default navbar-btn';
$baseTooltip = '|o:Set form in debugmode and show log: ';
$baseTooltip = '|o:Set form in debugmode and show actions from ';
$stateAll = ($this->formSpec[FORM_LOG_FILE_ALL] == '') ? '' : ' btn-warning';
$stateSession = ($this->formSpec[FORM_LOG_FILE_SESSION] == '') ? '' : ' btn-warning';
$formLogAll = $this->link->renderLink($baseUrl . "&" . FORM_LOG_MODE . "=" . FORM_LOG_ALL . $baseMisc . $stateAll . $baseTooltip . 'All');
$formLogSession = $this->link->renderLink($baseUrl . "&" . FORM_LOG_MODE . "=" . FORM_LOG_SESSION . $baseMisc . $stateSession . $baseTooltip . ' Per session');
$formLogAll = $this->link->renderLink($baseUrl . "&" . FORM_LOG_MODE . "=" . FORM_LOG_ALL . $baseMisc . $stateAll . $baseTooltip . 'all user');
$formLogSession = $this->link->renderLink($baseUrl . "&" . FORM_LOG_MODE . "=" . FORM_LOG_SESSION . $baseMisc . $stateSession . $baseTooltip . 'current user');
return $formLogAll . $formLogSession;
}
......
......@@ -207,7 +207,7 @@ class QuickFormQuery {
public function getForwardMode() {
if (!isset($this->formSpec[F_FORWARD_PAGE])) {
// For QFQ inline editing: no redirect.
// For QFQ inline editing: no redirect and no further processing.
return [API_REDIRECT => API_ANSWER_REDIRECT_NO, API_REDIRECT_URL => ''];
}
......@@ -907,7 +907,9 @@ class QuickFormQuery {
if (is_array($rows)) {
$this->store->appendToStore($rows, STORE_VAR);
// LOG
!empty($form[FORM_LOG_ACTIVE]) && Logger::logFormLine($form, "F:add to STORE_VAR", $rows[0]);
if(!empty($form[FORM_LOG_ACTIVE])) {
Logger::logFormLine($form, "F:add to STORE_VAR", $rows);
}
} else {
if (!empty($rows)) {
throw new UserFormException("Invalid statement for '" . FE_FILL_STORE_VAR . "': " . $formSpec[FE_FILL_STORE_VAR], ERROR_INVALID_OR_MISSING_PARAMETER);
......
......@@ -355,7 +355,7 @@ class Database {
* @throws DbException
* @throws UserFormException
*/
private function prepareExecute($sql, array $parameterArray = array(), &$queryType, array &$stat, $specificMessage = '') {
private function prepareExecute($sql, array $parameterArray, &$queryType, array &$stat, $specificMessage = '') {
$sqlLogMode = $this->isSqlModify($sql) ? SQL_LOG_MODE_MODIFY : SQL_LOG_MODE_ALL;
$result = 0;
......
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