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

N°1964 - Add informative message on dashboard when its container (eg. an object) is currently in edition

Browse Source
This commit is contained in:
Molkobain
2021-05-20 10:18:54 +02:00
parent f1e4120364
commit a82a2df6aa
16 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
application/cmdbabstract.class.inc.php
View File

@@ -510,11 +510,15 @@ HTML
*/
public function DisplayDashboard($oPage, $sAttCode)
{
// Retrieve parameters
/** @var bool $bIsContainerInEdition True if the container of the dashboard is currently in edition; meaning that the dashboard could not be up-to-date with data changed in the container (eg. when editing an object and adding linkedset items) */
$bIsContainerInEdition = (utils::ReadParam('host_container_in_edition', 'false') === 'true');
$sClass = get_class($this);
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
if (!$oAttDef instanceof AttributeDashboard)
{
// Consistency checks
if (!$oAttDef instanceof AttributeDashboard) {
throw new CoreException(Dict::S('UI:Error:InvalidDashboard'));
}
@@ -526,6 +530,10 @@ HTML
$bCanEdit = UserRights::IsAdministrator() || $oAttDef->IsUserEditable();
$sDivId = $oDashboard->GetId();
if ($bIsContainerInEdition) {
$oPage->AddUiBlock(AlertUIBlockFactory::MakeForInformation(Dict::S('UI:Dashboard:NotUpToDateUntilContainerSaved')));
}
$oPage->add('<div id="'.$sDivId.'" class="ibo-dashboard" data-role="ibo-dashboard">');
$aExtraParams = array(
'query_params' => $this->ToArgsForQuery(),
@@ -561,17 +569,12 @@ HTML
$aList = array_keys(MetaModel::ListAttributeDefs(get_class($this)));
}
$sClass = get_class($this);
foreach($aList as $sAttCode)
{
foreach($aList as $sAttCode) {
$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
if ($oAttDef instanceof AttributeDashboard)
{
if ($bEditMode)
{
continue;
}
if ($oAttDef instanceof AttributeDashboard) {
$sHostContainerInEditionUrlParam = ($bEditMode) ? '&host_container_in_edition=true' : '';
$oPage->AddAjaxTab($oAttDef->GetLabel(),
utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=dashboard&class='.get_class($this).'&id='.$this->GetKey().'&attcode='.$oAttDef->GetCode(),
utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php?operation=dashboard&class='.get_class($this).'&id='.$this->GetKey().'&attcode='.$oAttDef->GetCode().$sHostContainerInEditionUrlParam,
true,
'Class:'.$sClass.'/Attribute:'.$sAttCode,
AjaxTab::ENUM_TAB_PLACEHOLDER_DASHBOARD);