From 547b3602ccfc3cacf3610962507cb9a091ebaeec Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sat, 17 Oct 2020 21:14:19 +0200
Subject: [PATCH] FIX refresh of tasks combo must use an ajax page not a full
 html page

---
 htdocs/comm/action/card.php                 | 11 +++----
 htdocs/core/class/html.formprojet.class.php |  2 +-
 htdocs/projet/ajax/projects.php             | 33 +++++++++++----------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 74958b35333..3e9faafbe9d 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -389,7 +389,7 @@ if (empty($reshook) && $action == 'add')
 				$moreparam = '';
 				if ($user->id != $object->userownerid) $moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view.
 
-                //Create reminders
+				// Create reminders
                 if ($addreminder == 'on'){
                     $actionCommReminder = new ActionCommReminder($db);
 
@@ -1166,10 +1166,11 @@ if ($action == 'create')
 		print "\n".'<script type="text/javascript">';
 		print '$(document).ready(function () {
 	               $("#projectid").change(function () {
-                        var url = "'.$url.'&projectid="+$("#projectid").val();
+                        var url = "'.DOL_URL_ROOT.'/projet/ajax/projects.php?mode=gettasks&socid="+$("#projectid").val()+"&projectid="+$("#projectid").val();
+						console.log("Call url to get new list of tasks: "+url);
                         $.get(url, function(data) {
-                            console.log($( data ).find("#taskid").html());
-                            if (data) $("#taskid").html( $( data ).find("#taskid").html() ).select2();
+                            console.log(data);
+                            if (data) $("#taskid").html(data).select2();
                         })
                   });
                })';
@@ -1345,7 +1346,7 @@ if ($id > 0)
 		$object->contact_id   = GETPOST("contactid", 'int');
 		$object->fk_project  = GETPOST("projectid", 'int');
 
-		$object_private = GETPOST("note", 'restricthtml');
+		$object->note_private = GETPOST("note", 'restricthtml');
 	}
 
 	if ($result2 < 0 || $result3 < 0 || $result4 < 0 || $result5 < 0)
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index 9be08e133a1..1e5558546da 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -349,7 +349,7 @@ class FormProjets
 		if ($resql)
 		{
 			// Use select2 selector
-			if (!empty($conf->use_javascript_ajax))
+			if (empty($option_only) && !empty($conf->use_javascript_ajax))
 			{
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 			   	$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index e9c72f265e1..0036ae64353 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -33,10 +33,8 @@ if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML'))  define('NOREQUIREHT
 
 require '../../main.inc.php';
 
-$htmlname = GETPOST('htmlname', 'alpha');
+$htmlname = GETPOST('htmlname', 'aZ09');
 $socid = GETPOST('socid', 'int');
-$action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
 $discard_closed = GETPOST('discardclosed', 'int');
 
 
@@ -44,28 +42,31 @@ $discard_closed = GETPOST('discardclosed', 'int');
  * View
  */
 
-dol_syslog(join(',', $_GET));
+dol_syslog("Call ajax projet/ajax/projects.php");
+//dol_syslog(join(',', $_GET));
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 
-// Load translation files required by the page
-$langs->load("main");
-
 top_httphead();
 
-if (empty($htmlname)) return;
+if (empty($htmlname) && !GETPOST('mode', 'aZ09')) return;
 
-$match = preg_grep('/('.$htmlname.'[0-9]+)/', array_keys($_GET));
-sort($match);
-$idprod = (!empty($match[0]) ? $match[0] : '');
+// Mode to get list of projects
+if (!GETPOST('mode', 'aZ09') || GETPOST('mode', 'aZ09') != 'gettasks') {
+	// When used from jQuery, the search term is added as GET param "term".
+	$searchkey = (GETPOSTISSET($htmlname) ? GETPOST($htmlname, 'aZ09') : '');
 
-if (!GETPOST($htmlname) && !GETPOST($idprod)) return;
+	$formproject = new FormProjets($db);
+	$arrayresult = $formproject->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
+}
 
-// When used from jQuery, the search term is added as GET param "term".
-$searchkey = ((!empty($idprod) && GETPOST($idprod)) ?GETPOST($idprod) : (GETPOST($htmlname) ?GETPOST($htmlname) : ''));
+// Mode to get list of tasks
+if (GETPOST('mode', 'aZ09') == 'gettasks') {
+	$formproject = new FormProjets($db);
+	$formproject->selectTasks((!empty($$socid) ? $socid : -1), 0, 'taskid', 24, 1, '1', 1, 0, 0, 'maxwidth500', GETPOST('projectid', 'int'), '');
+	return;
+}
 
-$form = new FormProjets($db);
-$arrayresult = $form->select_projects_list($socid, '', $htmlname, 0, 0, 1, $discard_closed, 0, 0, 1, $searchkey);
 
 $db->close();