composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-12 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°3907 - Polishing: Run query

Browse Source
This commit is contained in:
acognet
2021-04-27 10:18:32 +02:00
parent 8bf9987174
commit 48d0fc6ddb
19 changed files with 94 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dictionaries/cs.dictionary.itop.ui.php
View File

@@ -1,28 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Localized data.
*
* @author Lukáš Dvořák <lukas.dvorak@itopportal.cz>
* @author Daniel Rokos <daniel.rokos@itopportal.cz>
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
//////////////////////////////////////////////////////////////////////
// Classes in 'gui'
//////////////////////////////////////////////////////////////////////
@@ -715,6 +696,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'UI:RunQuery:Title' => 'iTop - Vyhodnocení OQL dotazu',
'UI:RunQuery:QueryExamples' => 'Příklady dotazů',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Účel',
'UI:RunQuery:HeaderPurpose+' => 'Vysvětlení účelu dotazi',
'UI:RunQuery:HeaderOQLExpression' => 'OQL dotaz',

24
dictionaries/da.dictionary.itop.ui.php
View File

@@ -1,26 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* @author Erik Bøg <erik@boegmoeller.dk>
*
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @licence http://opensource.org/licenses/AGPL-3.0
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:AuditCategory' => 'Audit-kategori',
'Class:AuditCategory+' => 'Udsnit af alle Audits',
@@ -702,6 +685,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'UI:RunQuery:Title' => 'iTop - OQL Query Evaluering',
'UI:RunQuery:QueryExamples' => 'Query Eksempler',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Formål',
'UI:RunQuery:HeaderPurpose+' => 'Beskrivelse af forespørgslen',
'UI:RunQuery:HeaderOQLExpression' => 'OQL Udtryk',

23
dictionaries/de.dictionary.itop.ui.php
View File

@@ -1,25 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* @author Stephan Rosenke <stephan.rosenke@itomig.de>, <martin.raenker@itomig.de>
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @licence http://opensource.org/licenses/AGPL-3.0
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('DE DE', 'German', 'Deutsch', array(
'Class:AuditCategory' => 'Audit-Kategorie',
'Class:AuditCategory+' => 'Definition einer Objektgruppe, die durch Regeln überprüft werden soll.',
@@ -701,6 +685,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'UI:RunQuery:Title' => 'iTop - OQL-Abfrage-Auswertung',
'UI:RunQuery:QueryExamples' => 'Abfragebeispiele',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Verwendungszweck',
'UI:RunQuery:HeaderPurpose+' => 'Beschreibung der Abfrage',
'UI:RunQuery:HeaderOQLExpression' => 'OQL-Ausdruck',

1
dictionaries/en.dictionary.itop.ui.php
View File

@@ -708,6 +708,7 @@ We hope you’ll enjoy this version as much as we enjoyed imagining and creating
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - OQL Query Evaluation',
'UI:RunQuery:QueryExamples' => 'Query Examples',
'UI:RunQuery:QueryResults' => 'Query Results',
'UI:RunQuery:HeaderPurpose' => 'Purpose',
'UI:RunQuery:HeaderPurpose+' => 'Explanation about the query',
'UI:RunQuery:HeaderOQLExpression' => 'OQL Expression',

22
dictionaries/es_cr.dictionary.itop.ui.php
View File

@@ -1,26 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Localized data
*
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
//////////////////////////////////////////////////////////////////////
// Classes in 'gui'
//////////////////////////////////////////////////////////////////////
@@ -713,6 +696,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
'UI:RunQuery:Title' => 'iTop - Evaluación de consultas OQL',
'UI:RunQuery:QueryExamples' => 'Explorador de Consultas',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Propósito',
'UI:RunQuery:HeaderPurpose+' => 'Explicación acerca de la consulta',
'UI:RunQuery:HeaderOQLExpression' => 'Expresión OQL',

20
dictionaries/fr.dictionary.itop.ui.php
View File

@@ -1,24 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('FR FR', 'French', 'Français', array(
'Class:AuditCategory' => 'Catégorie d\'audit',
'Class:AuditCategory+' => 'Une section de l\'audit',
@@ -707,6 +692,7 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
'UI:RunQuery:Title' => 'iTop - Evaluation de requêtes OQL',
'UI:RunQuery:QueryExamples' => 'Exemples de requêtes',
'UI:RunQuery:QueryResults' => 'Résultats de la requête',
'UI:RunQuery:HeaderPurpose' => 'Objectif',
'UI:RunQuery:HeaderPurpose+' => 'But de la requête',
'UI:RunQuery:HeaderOQLExpression' => 'Requête OQL',

20
dictionaries/hu.dictionary.itop.ui.php
View File

@@ -1,24 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Class:AuditCategory' => 'Audit kategória',
'Class:AuditCategory+' => '',
@@ -700,6 +685,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'UI:RunQuery:Title' => 'iTop - OQL lekérdezés értékelés',
'UI:RunQuery:QueryExamples' => 'Lekérdezés példák',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Cél',
'UI:RunQuery:HeaderPurpose+' => '',
'UI:RunQuery:HeaderOQLExpression' => 'OQL kifejezés',

22
dictionaries/it.dictionary.itop.ui.php
View File

@@ -1,26 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Localized data
*
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
//////////////////////////////////////////////////////////////////////
// Classes in 'gui'
//////////////////////////////////////////////////////////////////////
@@ -713,6 +696,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'UI:RunQuery:Title' => 'iTop - Valutazione Query OQL',
'UI:RunQuery:QueryExamples' => 'Esempi di Query',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Scopo',
'UI:RunQuery:HeaderPurpose+' => '',
'UI:RunQuery:HeaderOQLExpression' => 'Espressioni OQL',

22
dictionaries/ja.dictionary.itop.ui.php
View File

@@ -1,24 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @licence http://opensource.org/licenses/AGPL-3.0
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:AuditCategory' => '監査カテゴリ',
'Class:AuditCategory+' => '監査全体の内部セクション',
@@ -700,6 +685,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'UI:RunQuery:Title' => 'iTop - OQLクエリ評価',
'UI:RunQuery:QueryExamples' => 'クエリの例',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => '目的',
'UI:RunQuery:HeaderPurpose+' => 'クエリについての説明',
'UI:RunQuery:HeaderOQLExpression' => 'OQL式',

1
dictionaries/nl.dictionary.itop.ui.php
View File

@@ -696,6 +696,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'UI:RunQuery:Title' => 'ITOP_APPLICATION_SHORT - Evaluatie van OQL-query',
'UI:RunQuery:QueryExamples' => 'Voorbeelden van query\'s',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Doel',
'UI:RunQuery:HeaderPurpose+' => 'Uitleg over de query',
'UI:RunQuery:HeaderOQLExpression' => 'OQL-expressie',

5
dictionaries/pl.dictionary.itop.ui.php
View File

@@ -1,7 +1,7 @@
<?php
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
@@ -697,6 +697,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
'UI:RunQuery:Title' => ITOP_APPLICATION_SHORT.' - Wykonywanie zapytań OQL',
'UI:RunQuery:QueryExamples' => 'Przykłady zapytań',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Cel, powód',
'UI:RunQuery:HeaderPurpose+' => 'Wyjaśnienie dotyczące zapytania',
'UI:RunQuery:HeaderOQLExpression' => 'Wyrażenie OQL',

22
dictionaries/pt_br.dictionary.itop.ui.php
View File

@@ -1,26 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Localized data
*
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
//////////////////////////////////////////////////////////////////////
// Classes in 'gui'
//////////////////////////////////////////////////////////////////////
@@ -713,6 +696,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'UI:RunQuery:Title' => 'Avaliar consultas OQL',
'UI:RunQuery:QueryExamples' => 'Exemplos de consultas',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Propósito',
'UI:RunQuery:HeaderPurpose+' => 'Explicação sobre a consulta',
'UI:RunQuery:HeaderOQLExpression' => 'A consulta na sintaxe OQL',

6
dictionaries/ru.dictionary.itop.ui.php
View File

@@ -1,4 +1,9 @@
<?php
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
/**
* Локализация интерфейса Combodo iTop подготовлена сообществом iTop по-русски http://community.itop-itsm.ru.
*
@@ -692,6 +697,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'UI:RunQuery:Title' => 'iTop - Оценка запросов OQL',
'UI:RunQuery:QueryExamples' => 'Примеры запросов',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Цель',
'UI:RunQuery:HeaderPurpose+' => 'Объяснение запросов',
'UI:RunQuery:HeaderOQLExpression' => 'Выражение OQL',

22
dictionaries/sk.dictionary.itop.ui.php
View File

@@ -1,22 +1,7 @@
<?php
/**
* Copyright (C) 2013-2021 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
*
*
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:AuditCategory' => 'Kategória auditu',
@@ -700,6 +685,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'UI:RunQuery:Title' => 'iTop - Určenie OQL Dopytu',
'UI:RunQuery:QueryExamples' => 'Príklad dopytu',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Účel',
'UI:RunQuery:HeaderPurpose+' => '',
'UI:RunQuery:HeaderOQLExpression' => 'OQL Výraz',

23
dictionaries/tr.dictionary.itop.ui.php
View File

@@ -1,27 +1,9 @@
<?php
// Copyright (C) 2010-2021 Combodo SARL
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// iTop is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* Localized data
*
* @author Izzet Sirin <izzet.sirin@htr.com.tr>
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
//////////////////////////////////////////////////////////////////////
// Classes in 'gui'
//////////////////////////////////////////////////////////////////////
@@ -714,6 +696,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'UI:RunQuery:Title' => 'iTop - OQL Sorgu değerlendirme',
'UI:RunQuery:QueryExamples' => 'Sorgu örnekleri',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => 'Amaç',
'UI:RunQuery:HeaderPurpose+' => 'Sorgu açıklaması',
'UI:RunQuery:HeaderOQLExpression' => 'OQL ifadesi',

25
dictionaries/zh_cn.dictionary.itop.ui.php
View File

@@ -1,25 +1,7 @@
<?php
/**
* Localized data
*
* @author Robert Deng <denglx@gmail.com>
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with iTop. If not, see <http://www.gnu.org/licenses/>
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
//////////////////////////////////////////////////////////////////////
// Classes in 'gui'
@@ -713,6 +695,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'UI:RunQuery:Title' => 'iTop - OQL 查询评估',
'UI:RunQuery:QueryExamples' => '示例查询',
'UI:RunQuery:QueryResults' => 'Query Results~~',
'UI:RunQuery:HeaderPurpose' => '目的',
'UI:RunQuery:HeaderPurpose+' => '该查询的解释',
'UI:RunQuery:HeaderOQLExpression' => 'OQL 表达式',

33
pages/ajax.searchform.php
View File

@@ -1,24 +1,13 @@
<?php
/**
* Copyright (C) 2013-2021 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
use Combodo\iTop\Application\Search\AjaxSearchException;
use Combodo\iTop\Application\Search\CriterionParser;
use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSectionUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Html\Html;
require_once('../approot.inc.php');
require_once(APPROOT.'/application/application.inc.php');
@@ -100,7 +89,7 @@ try
if (isset($sListId))
{
$oDisplayBlock->Display($oPage, $sListId, $aExtraParams);
$oPage->AddUiBlock($oDisplayBlock->GetDisplay($oPage, $sListId, $aExtraParams));
}
else
{
@@ -109,9 +98,15 @@ try
if (isset($aListParams['debug']) || UserRights::IsAdministrator())
{
$oPage->StartCollapsibleSection(Dict::S('UI:RunQuery:MoreInfo'), false, 'SearchQuery');
$oCollapsible = CollapsibleSectionUIBlockFactory::MakeStandard(Dict::S('UI:RunQuery:MoreInfo'));
$oPage->AddSubBlock($oCollapsible);
$oHtml = new Html(Dict::S('UI:RunQuery:DevelopedQuery').htmlentities($oFilter->ToOQL(), ENT_QUOTES, 'UTF-8'));
$oCollapsible->AddSubBlock($oHtml);
/*$oPage->StartCollapsibleSection(Dict::S('UI:RunQuery:MoreInfo'), false, 'SearchQuery');
$oPage->p(Dict::S('UI:RunQuery:DevelopedQuery').htmlentities($oFilter->ToOQL(), ENT_QUOTES, 'UTF-8'));
$oPage->EndCollapsibleSection();
$oPage->EndCollapsibleSection();*/
}
$oPage->output();

58
pages/run_query.php
View File

@@ -1,33 +1,25 @@
<?php
/**
* Copyright (C) 2013-2021 Combodo SARL
*
* This file is part of iTop.
*
* iTop is free software; you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* iTop is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
/*
* @copyright Copyright (C) 2010-2021 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
use Combodo\iTop\Application\UI\Base\Component\Alert\AlertUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSection;
use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSet;
use Combodo\iTop\Application\UI\Base\Component\Form\Form;
use Combodo\iTop\Application\UI\Base\Component\Form\FormUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Html\Html;
use Combodo\iTop\Application\UI\Base\Component\Html\HtmlFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Input\TextArea;
use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Title\TitleUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Component\Toolbar\ToolbarUIBlockFactory;
use Combodo\iTop\Application\UI\Base\Layout\UIContentBlockUIBlockFactory;
use Combodo\iTop\Renderer\BlockRenderer;
require_once('../approot.inc.php');
require_once(APPROOT.'/application/application.inc.php');
@@ -67,27 +59,28 @@ function ShowExamples($oP, $sExpression)
$aDisplayData = array();
$oAppContext = new ApplicationContext();
$sContext = $oAppContext->GetForForm();
foreach($aExamples as $sTopic => $aQueries)
{
foreach($aQueries as $sDescription => $sOql)
{
foreach ($aExamples as $sTopic => $aQueries) {
foreach ($aQueries as $sDescription => $sOql) {
$sHighlight = '';
$sDisable = '';
if ($sOql == $sExpression)
{
if ($sOql == $sExpression) {
// this one is currently being tested, highlight it
$sHighlight = "background-color:yellow;";
$sDisable = 'disabled';
// and remember we are testing a query of the list
$bUsingExample = true;
}
$oFormButton = FormUIBlockFactory::MakeStandard();
$oFormButton->AddSubBlock(InputUIBlockFactory::MakeForHidden("expression", $sOql));
$oButton = ButtonUIBlockFactory::MakeForSecondaryAction(Dict::S('UI:Button:Test'), '', '', true);
$oButton->SetIsDisabled($sDisable);
$oFormButton->AddSubBlock($oButton);
$oFormButton->AddSubBlock(new Html($sContext));
//$aDisplayData[$sTopic][] = array(
$aDisplayData[Dict::S('UI:RunQuery:QueryExamples')][] = array(
'desc' => "<div style=\"$sHighlight\">".utils::EscapeHtml($sDescription)."</div>",
'oql' => "<div style=\"$sHighlight\">".utils::EscapeHtml($sOql)."</div>",
//TODO 3.0.0 : buttons are not styled properly yet...
// This whole "query examples" may be migrated to TWIG using iTop Twig tags ?
'go' => "<form method=\"get\"><input type=\"hidden\" name=\"expression\" value=\"$sOql\"><input type=\"submit\" value=\"".Dict::S('UI:Button:Test')."\" $sDisable>$sContext</form>\n",
'go' => BlockRenderer::RenderBlockTemplates($oFormButton),
);
}
}
@@ -104,7 +97,7 @@ function ShowExamples($oP, $sExpression)
foreach ($aDisplayData as $sTopic => $aQueriesDisplayData) {
$bShowOpened = $bUsingExample;
$oTopic = $oP->GetTableBlock($aDisplayConfig, $aQueriesDisplayData);
$oTopic = DataTableUIBlockFactory::MakeForForm('oqlExample', $aDisplayConfig, $aQueriesDisplayData);
$oTopicSection = new CollapsibleSection($sTopic, [$oTopic]);
$oTopicSection->SetOpenedByDefault($bShowOpened);
$oP->AddUiBlock($oTopicSection);
@@ -179,10 +172,9 @@ try
$oQueryForm->AddSubBlock($oHiddenParams);
//--- Query textarea
$oQueryTitle = new Html('<h2>'.Dict::S('UI:RunQuery:ExpressionToEvaluate').'</h2>');
$oQueryForm->AddSubBlock($oQueryTitle);
$oQueryForm->AddSubBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:RunQuery:ExpressionToEvaluate'), 2));
$oQueryTextArea = new TextArea('expression', utils::EscapeHtml($sExpression), 'expression', 120, 8);
$oQueryTextArea->SetName('expression');
$oQueryTextArea->AddCSSClass('ibo-queryoql');
$oQueryForm->AddSubBlock($oQueryTextArea);
$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot()."/js/jquery.hotkeys.js");
@@ -215,12 +207,16 @@ EOF
null,
true
)->SetTooltip(Dict::S('UI:Button:Evaluate:Title'));
$oQueryForm->AddSubBlock($oQuerySubmit);
$oToolbarButtons = ToolbarUIBlockFactory::MakeStandard(null);
$oToolbarButtons->AddCSSClass('ibo-toolbar--button');
$oToolbarButtons->AddCSSClass('mb-5');
$oQueryForm->AddSubBlock($oToolbarButtons);
$oToolbarButtons->AddSubBlock($oQuerySubmit);
if ($oFilter) {
//--- Query filter
$oP->add("<h2>Query results</h2>\n");
$oP->AddSubBlock(TitleUIBlockFactory::MakeNeutral(Dict::S('UI:RunQuery:QueryResults'), 2));
$oResultBlock = new DisplayBlock($oFilter, 'list', false);
$oResultBlock->Display($oP, 'runquery');

1
templates/base/components/input/input-textarea.html.twig
View File

@@ -9,6 +9,7 @@
data-{{ sName }}="{{ sValue }}"
{% endfor %}
{% endif %}
{% if oUIBlock.GetAdditionalCSSClassesAsString() %} class="{{ oUIBlock.GetAdditionalCSSClassesAsString() }}"{% endif %}
{% if oUIBlock.GetPlaceHolder() %} placeholder="{{ oUIBlock.GetPlaceHolder() }}" {% endif %}
>{{ oUIBlock.GetValue()|raw }}</textarea>
{% endblock %}