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

N°3905 - Polishing: CSV Import - manage friendlyname

Browse Source
This commit is contained in:
acognet
2021-06-29 10:01:19 +02:00
parent f410bff309
commit 9d006c279b
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/bulkchange.class.inc.php
View File

@@ -452,20 +452,23 @@ class BulkChange
foreach ($this->m_aAttList as $sAttCode => $iCol) foreach ($this->m_aAttList as $sAttCode => $iCol)
{ {
// skip the private key, if any // skip the private key, if any
if ($sAttCode == 'id') continue; if (($sAttCode == 'id') || ($sAttCode == 'friendlyname')) {
continue;
}
$oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode); $oAttDef = MetaModel::GetAttributeDef($this->m_sClass, $sAttCode);
// skip reconciliation keys // skip reconciliation keys
if (!$oAttDef->IsWritable() && in_array($sAttCode, $this->m_aReconcilKeys)){ continue; } if (!$oAttDef->IsWritable() && in_array($sAttCode, $this->m_aReconcilKeys)) {
continue;
}
$aReasons = array(); $aReasons = array();
$iFlags = ($oTargetObj->IsNew()) $iFlags = ($oTargetObj->IsNew())
? $oTargetObj->GetInitialStateAttributeFlags($sAttCode, $aReasons) ? $oTargetObj->GetInitialStateAttributeFlags($sAttCode, $aReasons)
: $oTargetObj->GetAttributeFlags($sAttCode, $aReasons); : $oTargetObj->GetAttributeFlags($sAttCode, $aReasons);
if ( (($iFlags & OPT_ATT_READONLY) == OPT_ATT_READONLY) && ( $oTargetObj->Get($sAttCode) != $aRowData[$iCol]) ) if ( (($iFlags & OPT_ATT_READONLY) == OPT_ATT_READONLY) && ( $oTargetObj->Get($sAttCode) != $aRowData[$iCol]) ) {
{ $aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Readonly', $sAttCode, $oTargetObj->Get($sAttCode), $aRowData[$iCol]);
$aErrors[$sAttCode] = Dict::Format('UI:CSVReport-Value-Issue-Readonly', $sAttCode, $oTargetObj->Get($sAttCode), $aRowData[$iCol]);
} }
else if ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect()) else if ($oAttDef->IsLinkSet() && $oAttDef->IsIndirect())
{ {
@@ -1180,16 +1183,16 @@ class BulkChange
$oPage->add('<p>'.$sCollapsedLabel.'&nbsp;&nbsp;<a class="truncated" onclick="OnTruncatedHistoryToggle(true);">'.$sLinkLabel.'</p>'); $oPage->add('<p>'.$sCollapsedLabel.'&nbsp;&nbsp;<a class="truncated" onclick="OnTruncatedHistoryToggle(true);">'.$sLinkLabel.'</p>');
$oPage->add_ready_script( $oPage->add_ready_script(
<<<EOF <<<EOF
$('#$sAjaxDivId table.listResults').addClass('truncated'); $('#$sAjaxDivId table.listResults').addClass('truncated');
$('#$sAjaxDivId table.listResults tr:last td').addClass('truncated'); $('#$sAjaxDivId table.listResults tr:last td').addClass('truncated');
EOF EOF
); );
$sAppContext = $oAppContext->GetForLink(); $sAppContext = $oAppContext->GetForLink();
$oPage->add_script( $oPage->add_script(
<<<EOF <<<EOF
function OnTruncatedHistoryToggle(bShowAll) function OnTruncatedHistoryToggle(bShowAll)
{ {
$('#csv_history_reload').html('<img src="../images/indicator.gif"/>'); $('#csv_history_reload').html('<img src="../images/indicator.gif"/>');

2
pages/csvimport.php
View File

@@ -1586,7 +1586,7 @@ EOF
{ {
case 11: case 11:
// Asynchronous tab // Asynchronous tab
$oPage = new ajax_page(''); $oPage = new AjaxPage('');
BulkChange::DisplayImportHistory($oPage); BulkChange::DisplayImportHistory($oPage);
$oPage->add_ready_script('$("#CSVImportHistory table.listResults").tableHover();'); $oPage->add_ready_script('$("#CSVImportHistory table.listResults").tableHover();');
$oPage->add_ready_script('$("#CSVImportHistory table.listResults").tablesorter( { widgets: ["myZebra", "truncatedList"]} );'); $oPage->add_ready_script('$("#CSVImportHistory table.listResults").tablesorter( { widgets: ["myZebra", "truncatedList"]} );');