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

N°3528 - Finish silo selection migration

Browse Source
This commit is contained in:
acognet
2021-01-22 11:46:55 +01:00
parent 76fc4e3ee2
commit f1cad5993b
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -193,6 +193,7 @@ class UIExtKeyWidget
{
$bAddingValue=true;
}
$bAutoSelectValue=false;
while($oObj = $oAllowedValues->Fetch())
{
$aOption=[];
@@ -205,11 +206,8 @@ class UIExtKeyWidget
$sDisplayValue=$oObj->GetName();
if($value != $oObj->GetKey())
{
$oPage->add_ready_script(
<<<EOF
$('#$this->iId').attr('data-validate','dependencies');
EOF
);
$bAutoSelectValue=true;
$value=$oObj->GetKey();
}
}
else
@@ -246,6 +244,19 @@ EOF
EOF
);
if($bAutoSelectValue)
{
$oPage->add_ready_script(
<<<EOF
$('#$this->iId > option').val('{$value}');
$('#$this->iId > option').html('{$sDisplayValue}');
$('#field_$this->iId').find('.ibo-input-select').append('<div data-value="{$value}">{$sDisplayValue}</div>');
$('#$this->iId > .ibo-input-select').val('{$value}');
$('#$this->iId > .ibo-input-select').html('{$sDisplayValue}');
$('#$this->iId').attr('data-validate','dependencies');
EOF
);
}
}
else
{
@@ -272,6 +283,7 @@ EOF
// the input for the auto-complete
$sHTMLValue .= "<input class=\"field_autocomplete ibo-input ibo-input-select ibo-input-select-autocomplete\" type=\"text\" id=\"label_$this->iId\" value=\"$sDisplayValue\"/>";
$sHTMLValue .= "<div class=\"field_input_btn ibo-input-select--action-button ibo-input-select--action-button--search\" id=\"mini_search_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.Search();\"><i class=\"fas fa-search\"></i></div>";
$sHTMLValue .= "<div class=\"field_input_btn ibo-input-select--action-button ibo-input-select--action-button--clear\" id=\"mini_clear_{$this->iId}\" onClick=\"oACWidget_{$this->iId}.Clear();\"><i class=\"fas fa-times\"></i></div>";
// another hidden input to store & pass the object's Id
$sHTMLValue .= "<input type=\"hidden\" id=\"$this->iId\" name=\"{$sAttrFieldPrefix}{$sFieldName}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\" />\n";

6
css/backoffice/components/input/_input-select.scss
View File

@@ -21,8 +21,9 @@ $ibo-input-select--action-button--padding-y: 5px !default;
$ibo-input-select--action-button--hierarchy--margin-left: -60px !default;
$ibo-input-select--action-button--create--margin-left: -38px !default;
$ibo-input-select--action-button--search--margin-left: -60px !default;
$ibo-input-select--action-button--clear--margin-left: -72px !default;
$ibo-input-select-autocomplete-action-button--hierarchy--margin-left: -82px !default;
$ibo-input-select-autocomplete-action-button--hierarchy--margin-left: -92px !default;
.ibo-input-select{
appearance: none;
@@ -79,6 +80,9 @@ $ibo-input-select-autocomplete-action-button--hierarchy--margin-left: -82px !def
&.ibo-input-select--action-button--search{
margin-left: $ibo-input-select--action-button--search--margin-left;
}
&.ibo-input-select--action-button--clear{
margin-left: $ibo-input-select--action-button--clear--margin-left;
}
}
.ibo-input-select-autocomplete ~ .ibo-input-select--action-button--hierarchy{
margin-left: $ibo-input-select-autocomplete-action-button--hierarchy--margin-left;

4
css/backoffice/layout/_navigation-menu.scss
View File

@@ -58,6 +58,7 @@ $ibo-navigation-menu--silo-selection--input--padding-right: 38px !default;
$ibo-navigation-menu--silo-selection--input-select--action-button--hierarchy--margin-left: -42px !default;
$ibo-navigation-menu--silo-selection--input-select-autocomplete--padding-left: 60px !default;
$ibo-navigation-menu--silo-selection--input-select-autocomplete--action-button--search--margin-left: -42px !default;
$ibo-navigation-menu--silo-selection--input-select-autocomplete--action-button--clear--margin-left: -72px !default;
$ibo-navigation-menu--silo-selection--input-select-autocomplete--action-button--hierarchy--margin-left: -60px !default;
$ibo-navigation-menu--silo-visual-hint--top: 2px !default;
@@ -453,6 +454,9 @@ $ibo-navigation-menu--user-info--height--is-expanded: 100% !default;
~ .ibo-input-select--action-button--search{
margin-left: $ibo-navigation-menu--silo-selection--input-select-autocomplete--action-button--search--margin-left;
}
~ .ibo-input-select--action-button--clear{
margin-left: $ibo-navigation-menu--silo-selection--input-select-autocomplete--action-button--clear--margin-left;
}
~ .ibo-input-select--action-button--hierarchy{
margin-left: $ibo-navigation-menu--silo-selection--input-select-autocomplete--action-button--hierarchy--margin-left;
}

8
js/extkeywidget.js
View File

@@ -405,6 +405,14 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
return false; // Do NOT submit the form in case we are called by OnSubmit...
};
this.Clear = function () {
$('#'+me.id).val('');
$('#label_'+me.id).val('');
$('#'+me.id).trigger('validate');
$('#'+me.id).trigger('extkeychange');
$('#'+me.id).trigger('change');
};
// Workaround for a ui.jquery limitation: if the content of
// the dialog contains many INPUTs, closing and opening the
// dialog is very slow. So empty it each time.