Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

Dolibarr · Feb 27, 2019 · 8bdf1cd · 8bdf1cd
2 parents da826c4 + fb2b7a6
commit 8bdf1cd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -20,9 +20,10 @@
 			{
 				$align=$extrafields->getAlignFlag($key, $extrafieldsobjectkey);
 				print '<td';
-				if ($align) print ' align="'.$align.'"';
+                if ($align) print ' align="'.$align.'"';
-				print '>';
+                print ' data-key="'.$key.'"';
-				$tmpkey='options_'.$key;
+                print '>';
+                $tmpkey='options_'.$key;
 				if (in_array($extrafields->attributes[$extrafieldsobjectkey]['type'][$key], array('date', 'datetime', 'timestamp')) && !is_numeric($obj->$tmpkey))
 				{
 					$datenotinstring = $obj->$tmpkey;

diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -22,7 +22,7 @@
 				$sortonfield = "ef.".$key;
 				if (! empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) $sortonfield='';
 				if ($extrafields->attributes[$extrafieldsobjectkey]['type'][$key] == 'separate') print '<th class="liste_titre thseparator"></th>';
-				else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'"':''), $sortfield, $sortorder)."\n";
+				else print getTitleFieldOfList($langs->trans($extralabels[$key]), 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align?'align="'.$align.'" data-titlekey="'.$key.'"':'data-titlekey="'.$key.'"'), $sortfield, $sortorder)."\n";
 			}
 		}
 	}

diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
@@ -625,7 +625,7 @@
 	$userAccess = $projectstatic->restrictedProjectArea($user);    // why this ?
 	if ($userAccess >= 0)
 	{
-		print '<tr class="oddeven">';
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 
 		// Ref
 		if (! empty($arrayfields['t.ref']['checked']))