From dade45308cfd884e9600627ae26d2d94d4929945 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Wed, 29 Sep 2021 11:30:07 +0200 Subject: [PATCH 1/3] =?UTF-8?q?N=C2=B04332=20-=20Fix=20table=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datamodels/2.x/authent-ldap/module.authent-ldap.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/datamodels/2.x/authent-ldap/module.authent-ldap.php b/datamodels/2.x/authent-ldap/module.authent-ldap.php index d262d4051..f07950925 100755 --- a/datamodels/2.x/authent-ldap/module.authent-ldap.php +++ b/datamodels/2.x/authent-ldap/module.authent-ldap.php @@ -71,11 +71,9 @@ class AuthentLDAPInstaller extends ModuleInstallerAPI public static function AfterDataLoad(Config $oConfiguration, $sPreviousVersion, $sCurrentVersion) { // Create missing table entries - $sTablePrefix = $oConfiguration->Get('db_subname'); - if (strlen($sTablePrefix) != 0) { - $sTablePrefix .= '.'; - } - $sSQL = "insert into {$sTablePrefix}priv_user_ldap (id) select U.id from {$sTablePrefix}priv_user as U left join {$sTablePrefix}priv_user_ldap as L on U.id = L.id where U.finalclass='UserLDAP' and isnull(L.id);"; + $sUserLDAPTable = MetaModel::DBGetTable('UserLDAP'); + $sUserTable = MetaModel::DBGetTable('User'); + $sSQL = "insert into $sUserLDAPTable (id) select U.id from $sUserTable as U left join $sUserLDAPTable as L on U.id = L.id where U.finalclass='UserLDAP' and isnull(L.id);"; CMDBSource::Query($sSQL); } } From 1a1439946b7c1948d503ece5936593b40c0debde Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Wed, 29 Sep 2021 14:32:01 +0200 Subject: [PATCH 2/3] =?UTF-8?q?N=C2=B04338=20-=20Fix=20indirect=20links=20?= =?UTF-8?q?removal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- js/linkswidget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/linkswidget.js b/js/linkswidget.js index f65c256e9..6feca2dd5 100644 --- a/js/linkswidget.js +++ b/js/linkswidget.js @@ -45,7 +45,7 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH this.RemoveSelected = function () { let my_id = '#'+me.id; - $('#linkedset_'+me.id+' tr.selected').each(function () { + $('#linkedset_'+me.id+' .selection:checked').closest('tr').each(function () { $('#datatable_'+me.id).DataTable().row($(this)).remove().draw(); var oCheckbox = $(this).find('.selection'); let iLink = $(oCheckbox).attr('data-link-id'); From f9fc85e763daa10cd553c983c01a3af451fa57d1 Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Tue, 28 Sep 2021 15:07:27 +0200 Subject: [PATCH 3/3] =?UTF-8?q?N=C2=B04326=20-=20Fix=20error=20in=20dashbo?= =?UTF-8?q?ard=20when=20no=20tooltip=20exist=20on=20Pill?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 6caf78fdcd3d35bf34f4845a77ed6ee42e8b988b) --- sources/application/UI/Base/Component/Pill/Pill.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sources/application/UI/Base/Component/Pill/Pill.php b/sources/application/UI/Base/Component/Pill/Pill.php index 57c361769..86bf4691a 100644 --- a/sources/application/UI/Base/Component/Pill/Pill.php +++ b/sources/application/UI/Base/Component/Pill/Pill.php @@ -121,12 +121,13 @@ class Pill extends UIContentBlock } /** - * @param string $sTooltip - * * @see static::$sTooltip + * + * @param string|null $sTooltip + * * @return $this */ - public function SetTooltip(string $sTooltip) + public function SetTooltip(?string $sTooltip) { $this->sTooltip = $sTooltip;