Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: use loadurl just for textarea and numeric

Browse Source
This commit is contained in:
Regis Houssin
2011-10-27 18:17:27 +02:00
parent df19c5e606
commit 1137b69a03
4 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/compta/deplacement/fiche.php
View File

@@ -361,7 +361,7 @@ else if ($id)
// Km/Price // Km/Price
print '<tr><td>'.$langs->trans("FeesKilometersOrAmout").'</td>'; 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 // Where
print '<tr><td>'.$langs->trans("CompanyVisited").'</td>'; print '<tr><td>'.$langs->trans("CompanyVisited").'</td>';
@@ -405,7 +405,7 @@ else if ($id)
// Public note // Public note
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>'; print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
print '<td valign="top" colspan="3">'; 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>"; print "</td></tr>";
// Private note // Private note
@@ -413,7 +413,7 @@ else if ($id)
{ {
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
print '<td valign="top" colspan="3">'; 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>"; print "</td></tr>";
} }

1
htdocs/core/class/html.form.class.php
View File

@@ -156,6 +156,7 @@ class Form
global $user; global $user;
$out=''; $out='';
$value = ($value ? $value : "&nbsp;");
if ($condition) if ($condition)
{ {

7
htdocs/core/js/editinplace.js
View File

@@ -42,13 +42,6 @@ $(document).ready(function() {
cancel : cancelInPlace, cancel : cancelInPlace,
submit : submitInPlace, submit : submitInPlace,
indicator : indicatorInPlace, indicator : indicatorInPlace,
loadurl : urlLoadInPlace,
loaddata : {
type: 'text',
element: element,
table_element: table_element,
fk_element: fk_element
},
submitdata : { submitdata : {
type: 'text', type: 'text',
element: element, element: element,

4
htdocs/fichinter/fiche.php
View File

@@ -870,7 +870,7 @@ else if ($id > 0 || ! empty($ref))
// Public note // Public note
print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>'; print '<tr><td valign="top">'.$langs->trans("NotePublic").'</td>';
print '<td valign="top" colspan="3">'; 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>"; print "</td></tr>";
// Private note // Private note
@@ -878,7 +878,7 @@ else if ($id > 0 || ! empty($ref))
{ {
print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>'; print '<tr><td valign="top">'.$langs->trans("NotePrivate").'</td>';
print '<td valign="top" colspan="3">'; 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>"; print "</td></tr>";
} }