From 764b0f8e31f4d707dc57b81d8471f44fe3b690a2 Mon Sep 17 00:00:00 2001
From: Eric <eric.espie@combodo.com>
Date: Tue, 11 Dec 2018 15:25:57 +0100
Subject: [PATCH 1/2] =?UTF-8?q?N=C2=B01846=20-=20Fix=20Object=20Copier:=20?=
 =?UTF-8?q?Create=20Ticket=20from=20CI,=20duplicate=20links?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 44b7821015a23bc69bda3de91154d777f765f052)
---
 application/ui.linkswidget.class.inc.php | 5 ++++-
 js/linkswidget.js                        | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/ui.linkswidget.class.inc.php b/application/ui.linkswidget.class.inc.php
index 3f61c58181..e03f884e54 100644
--- a/application/ui.linkswidget.class.inc.php
+++ b/application/ui.linkswidget.class.inc.php
@@ -358,7 +358,8 @@ EOF
             if ($oCurrentLink->IsNew())
             {
                 $key = -($iAddedId++);
-	            $aAddedLinks[] = array('iAddedId' => -$key, 'iRemote' => $oCurrentLink->Get($this->m_sExtKeyToRemote));
+                $iUniqueId = -$key;
+	            $aAddedLinks[] = array('iAddedId' => $iUniqueId, 'iRemote' => $oCurrentLink->Get($this->m_sExtKeyToRemote));
             }
             else
             {
@@ -377,6 +378,7 @@ EOF
 		oWidget{$this->m_iInputId}.Init();
 EOF
 );
+
 		foreach ($aAddedLinks as $aAddedLink)
 		{
 			$oPage->add_ready_script(<<<EOF
@@ -384,6 +386,7 @@ EOF
 EOF
 			);
 		}
+
 		$sHtmlValue .= "<span style=\"float:left;\">&nbsp;&nbsp;&nbsp;<img src=\"../images/tv-item-last.gif\">&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnRemove\" type=\"button\" value=\"".Dict::S('UI:RemoveLinkedObjectsOf_Class')."\" onClick=\"oWidget{$this->m_iInputId}.RemoveSelected();\" >";
 		$sHtmlValue .= "&nbsp;&nbsp;&nbsp;<input id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_btnAdd\" type=\"button\" value=\"".Dict::Format('UI:AddLinkedObjectsOf_Class', MetaModel::GetName($this->m_sRemoteClass))."\" onClick=\"oWidget{$this->m_iInputId}.AddObjects();\"><span id=\"{$this->m_sAttCode}{$this->m_sNameSuffix}_indicatorAdd\"></span></span>\n";
 		$sHtmlValue .= "<span style=\"clear:both;\"><p>&nbsp;</p></span>\n";
diff --git a/js/linkswidget.js b/js/linkswidget.js
index e75c37b0f9..c29c9437e3 100644
--- a/js/linkswidget.js
+++ b/js/linkswidget.js
@@ -78,6 +78,10 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 			else
 			{
 				var iUniqueId = $(this).attr('data-unique-id');
+				if (iUniqueId < 0)
+				{
+					iUniqueId = -iUniqueId;
+				}
 				me.aAdded[iUniqueId] = null;
 			}
 		});

From 16c8466841c02af03267a7a2fb0cbc4ef5d2a505 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Mon, 25 Mar 2019 15:39:45 +0100
Subject: [PATCH 2/2] =?UTF-8?q?N=C2=B02115=20Fix=20regression=20introduced?=
 =?UTF-8?q?=20in=20N=C2=B01443:=20Left=20pane=20menu=20not=20showing=20due?=
 =?UTF-8?q?=20a=20JS=20error?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/jquery.tablesorter.pager.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/js/jquery.tablesorter.pager.js b/js/jquery.tablesorter.pager.js
index 874fe289db..cab1060e1c 100644
--- a/js/jquery.tablesorter.pager.js
+++ b/js/jquery.tablesorter.pager.js
@@ -113,8 +113,13 @@ function sprintf(format, etc) {
 				$(':input[name^=storedSelection]', pager).remove();
 			}
 			
-			function storeSelection(table, pager, id, value, disabled=false)
+			function storeSelection(table, pager, id, value, disabled)
 			{
+				if(disabled == undefined)
+				{
+					disabled = false;
+				}
+
 				var valueToStore = value;
 				if (table.config.selectionMode == 'negative')
 				{