Fix: use loadurl just for textarea and numeric

Dolibarr · Oct 27, 2011 · 1137b69 · 1137b69
1 parent df19c5e
commit 1137b69
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/htdocs/compta/deplacement/fiche.php b/htdocs/compta/deplacement/fiche.php
@@ -361,7 +361,7 @@
 
 			// Km/Price
 			print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td>';
-			print '<td>'.$form->editInPlace($object->km, 'km', $object->element, 'text').'</td></tr>';
+			print '<td>'.$form->editInPlace($object->km, 'km', $object->element, 'numeric').'</td></tr>';
 
 			// Where
 			print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
@@ -405,15 +405,15 @@
 			// Public note
 			print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
 			print '<td valign="top" colspan="3">';
-			print $form->editInPlace(($object->note_public ? dol_nl2br($object->note_public) : "&nbsp;"), 'note_public', $user->rights->deplacement->creer);
+			print $form->editInPlace(dol_nl2br($object->note_public), 'note_public', $user->rights->deplacement->creer);
 			print "</td></tr>";
 
 			// Private note
 			if (! $user->societe_id)
 			{
 				print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
 				print '<td valign="top" colspan="3">';
-				print $form->editInPlace(($object->note_private ? dol_nl2br($object->note_private) : "&nbsp;"), 'note', $user->rights->deplacement->creer);
+				print $form->editInPlace(dol_nl2br($object->note_private), 'note', $user->rights->deplacement->creer);
 				print "</td></tr>";
 			}
 

diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
@@ -156,6 +156,7 @@ function editInPlace($value, $htmlname, $condition, $type='area')
     	global $user;
 
     	$out='';
+    	$value = ($value ? $value : "&nbsp;");
 
     	if ($condition)
     	{

diff --git a/htdocs/core/js/editinplace.js b/htdocs/core/js/editinplace.js
@@ -42,13 +42,6 @@ $(document).ready(function() {
 			cancel		: cancelInPlace,
 			submit		: submitInPlace,
 			indicator	: indicatorInPlace,
-			loadurl		: urlLoadInPlace,
-			loaddata	: {
-				type: 'text',
-				element: element,
-				table_element: table_element,
-				fk_element: fk_element
-			},
 			submitdata	: {
 				type: 'text',
 				element: element,

diff --git a/htdocs/fichinter/fiche.php b/htdocs/fichinter/fiche.php
@@ -870,15 +870,15 @@
     // Public note
     print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
     print '<td valign="top" colspan="3">';
-    print $form->editInPlace(($object->note_public ? dol_nl2br($object->note_public) : "&nbsp;"), 'note_public', $user->rights->ficheinter->creer);
+    print $form->editInPlace(dol_nl2br($object->note_public), 'note_public', $user->rights->ficheinter->creer);
     print "</td></tr>";
 
     // Private note
     if (! $user->societe_id)
     {
     	print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
     	print '<td valign="top" colspan="3">';
-    	print $form->editInPlace(($object->note_private ? dol_nl2br($object->note_private) : "&nbsp;"), 'note_private', $user->rights->ficheinter->creer);
+    	print $form->editInPlace(dol_nl2br($object->note_private), 'note_private', $user->rights->ficheinter->creer);
     	print "</td></tr>";
     }