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°2508 - Include Obsolescence icon within list and autocomplete

Browse Source
This commit is contained in:
acognet
2020-08-18 12:41:16 +02:00
parent 0b9ba4d053
commit 4648e436ac
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/ui.extkeywidget.class.inc.php
View File

@@ -298,12 +298,7 @@ JS
);
}
$sHTMLValue .= "</div>";
// Note: This test is no longer necessary as we changed the markup to extract validation decoration in the standard .field_input_xxx container
//if (($sDisplayStyle == 'select') || ($sDisplayStyle == 'list'))
//{
$sHTMLValue .= "<span class=\"form_validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
//}
return $sHTMLValue;
}
@@ -324,7 +319,6 @@ JS
$sAttrFieldPrefix = ($this->bSearchMode) ? '' : 'attr_';
$sHTMLValue = "<div class=\"field_input_zone field_input_extkey\">";
$sFilter = addslashes($oAllowedValues->GetFilter()->ToOQL());
if (is_null($oAllowedValues))
{
@@ -612,12 +606,7 @@ JS
);
}
$sHTMLValue .= "</div>";
// Note: This test is no longer necessary as we changed the markup to extract validation decoration in the standard .field_input_xxx container
//if (($sDisplayStyle == 'select') || ($sDisplayStyle == 'list'))
//{
$sHTMLValue .= "<span class=\"form_validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
//}
$sHTMLValue .= "<span class=\"form_validation\" id=\"v_{$this->iId}\"></span><span class=\"field_status\" id=\"fstatus_{$this->iId}\"></span>";
return $sHTMLValue;
}

4
js/extkeywidget.js
View File

@@ -45,7 +45,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
item: function(item) {
if ( item.obsolescence_flag == 1)
{
console.warn("ici");
val = '<span class="object-ref-icon fas fa-eye-slash object-obsolete fa-1x fa-fw"></span>'+item.label;
}
else
@@ -56,9 +55,6 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
.append(val);
},
option: function(item) {
console.warn(item);
console.warn(item.obsolescence_flag);
console.warn($.inArray(item, 'obsolescence_flag'));
if ( item.obsolescence_flag == 1)
{
console.warn("ici");