composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-21 16:22:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into feature/backoffice-full-moon-design

Browse Source 
# Conflicts:
#	application/datamodel.application.xml
#	application/itopwebpage.class.inc.php
#	css/light-grey.scss
This commit is contained in:
Molkobain
2020-08-19 10:20:37 +02:00
parent 417008f549 c69e83f779
commit c5b8d3fa72
80 changed files with 2483 additions and 1530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-portal-base/portal/public/js/export.js
View File

@@ -20,8 +20,8 @@ function ExportStartExport() {
var oParams = {};
oParams.operation = 'export_build';
oParams.format = sFormat;
oParams.expression = sOQL;
oParams.fields = sFields;
oParams.token = sToken;
oParams.start = 1;
$.post(GetAbsoluteUrlAppRoot() + 'pages/ajax.render.php', oParams, function (data) {
if (data == null) {
ExportError('Export failed (no data provided), please contact your administrator');

4
datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php
View File

@@ -326,6 +326,10 @@ class ManageBrick extends PortalBrick
return $this->sTileMode;
}
public function GetDecorationCssClass()
{
return static::$aPresentationData[$this->sTileMode]['decorationCssClass'];
}
/**
* Sets the tile mode (display)
*

23
datamodels/2.x/itop-portal-base/portal/src/Controller/BrowseBrickController.php
View File

@@ -20,22 +20,22 @@
namespace Combodo\iTop\Portal\Controller;
use AttributeExternalKey;
use AttributeLinkedSetIndirect;
use BinaryExpression;
use Combodo\iTop\Portal\Brick\AbstractBrick;
use Combodo\iTop\Portal\Brick\BrowseBrick;
use Combodo\iTop\Portal\Helper\BrowseBrickHelper;
use DBObjectSearch;
use DBObjectSet;
use DBSearch;
use FieldExpression;
use MetaModel;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\HttpException;
use MetaModel;
use DBSearch;
use DBObjectSet;
use BinaryExpression;
use FieldExpression;
use VariableExpression;
use AttributeExternalKey;
use Combodo\iTop\Portal\Brick\AbstractBrick;
use Combodo\iTop\Portal\Brick\BrowseBrick;
/**
* Class BrowseBrickController
@@ -156,8 +156,11 @@ class BrowseBrickController extends BrickController
{
if (array_key_exists($sLevelAlias, $aRealiasingMap))
{
$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->RenameAlias($aRealiasingMap[$sLevelAlias],
$sLevelAlias);
/** @since 2.7.2 */
foreach ($aRealiasingMap[$sLevelAlias] as $sAliasToChange)
{
$aLevelsProperties[$aLevelsPropertiesKeys[$i]]['search']->RenameAlias($sAliasToChange, $sLevelAlias);
}
}
}
}

12
datamodels/2.x/itop-portal-base/portal/src/Controller/ManageBrickController.php
View File

@@ -28,6 +28,7 @@ use AttributeImage;
use AttributeSet;
use AttributeTagSet;
use BinaryExpression;
use BulkExport;
use CMDBSource;
use Combodo\iTop\Portal\Brick\AbstractBrick;
use Combodo\iTop\Portal\Brick\ManageBrick;
@@ -245,11 +246,18 @@ class ManageBrickController extends BrickController
}
$sFields = implode(',', $aFields);
$sFormat = 'xlsx';
$oSearch->UpdateContextFromUser();
$oExporter = BulkExport::FindExporter($sFormat, $oSearch);
$oExporter->SetObjectList($oSearch);
$oExporter->SetFormat($sFormat);
$oExporter->SetChunkSize(EXPORTER_DEFAULT_CHUNK_SIZE);
$oExporter->SetFields($sFields);
$aData = array(
'oBrick' => $oBrick,
'sBrickId' => $sBrickId,
'sFields' => $sFields,
'sOQL' => $oSearch->ToOQL(),
'sToken' => $oExporter->SaveState(),
);
return $this->render(static::EXCEL_EXPORT_TEMPLATE_PATH, $aData);

3
datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/popup-export-excel.html.twig
View File

@@ -27,9 +27,8 @@
<script type="text/javascript">
var sDataState = 'not-yet-started';
var sOQL = {{ sOQL|json_encode|raw }};
var sToken = {{ sToken|raw }};
var sFormat = 'xlsx';
var sFields = "{{ sFields }}";
$(document).ready(function () {
window.setTimeout(function () {

2
datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/tile-chart.html.twig
View File

@@ -10,7 +10,7 @@
id="brick-{{ oBrick.GetId }}"
data-brick-id="{{ oBrick.GetId }}">
<div>
<div class="tile_title"><span class="icon fas fa-{{ oBrick.GetTileMode }}"></span> {{ oBrick.GetTitle()|dict_s }}
<div class="tile_title"><span class="icon fas fa-{{ oBrick.GetDecorationCssClass }}"></span> {{ oBrick.GetTitle()|dict_s }}
({{ iCount }})</span> </div>
{% include 'itop-portal-base/portal/templates/bricks/manage/mode-' ~ oBrick.GetTileMode ~ '.html.twig' with {'oBrick': oBrick, 'aColumns': aColumns, 'aNames': aNames, 'aUrls': aUrls, 'aDisplayValues': aDisplayValues} %}
</div>