lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix inline edit

Browse Source
This commit is contained in:
Laurent Destailleur 2017-12-20 12:45:38 +01:00
parent ef9468f78a
commit b1f98b5903
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/core/ajax/saveinplace.php
View File

@ -94,10 +94,21 @@ if (! empty($field) && ! empty($element) && ! empty($table_element) && ! empty($
} }
else $newelement = $element; else $newelement = $element;
if (! empty($user->rights->$newelement->creer) || ! empty($user->rights->$newelement->create) || ! empty($user->rights->$newelement->write) $_POST['action']='update'; // Hack so restrictarea can test permission on write too
|| (isset($subelement) && (! empty($user->rights->$newelement->$subelement->creer) || ! empty($user->rights->$newelement->$subelement->write))) $feature = $newelement;
|| ($element == 'payment' && $user->rights->facture->paiement) $object_id = $fk_element;
|| ($element == 'payment_supplier' && $user->rights->fournisseur->facture->creer)) if ($feature == 'expedition' || $feature == 'shipping')
{
$feature = 'commande';
$object_id = 0;
}
if ($feature == 'shipping') $feature = 'commande';
//var_dump(GETPOST('action','aZ09'));
//var_dump($newelement.'-'.$subelement."-".$feature."-".$object_id);
$check_access = restrictedArea($user, $feature, $object_id, '', $subelement);
//var_dump($user->rights);
if ($check_access)
{ {
// Clean parameters // Clean parameters
$newvalue = trim($value); $newvalue = trim($value);

14
htdocs/expedition/card.php
View File

@ -127,7 +127,7 @@ if (empty($reshook))
include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
// Set incoterm // Reopen
if ($action == 'reopen' && $user->rights->expedition->creer) if ($action == 'reopen' && $user->rights->expedition->creer)
{ {
$object->fetch($id); $object->fetch($id);
@ -503,8 +503,8 @@ if (empty($reshook))
} }
} }
// Action update description of emailing // Action update
else if ($action == 'settrackingnumber' || $action == 'settrackingurl' else if ($action == 'settracking_number' || $action == 'settracking_url'
|| $action == 'settrueWeight' || $action == 'settrueWeight'
|| $action == 'settrueWidth' || $action == 'settrueWidth'
|| $action == 'settrueHeight' || $action == 'settrueHeight'
@ -513,8 +513,8 @@ if (empty($reshook))
{ {
$error=0; $error=0;
if ($action == 'settrackingnumber') $object->tracking_number = trim(GETPOST('trackingnumber','alpha')); if ($action == 'settracking_number') $object->tracking_number = trim(GETPOST('tracking_number','alpha'));
if ($action == 'settrackingurl') $object->tracking_url = trim(GETPOST('trackingurl','int')); if ($action == 'settracking_url') $object->tracking_url = trim(GETPOST('tracking_url','int'));
if ($action == 'settrueWeight') { if ($action == 'settrueWeight') {
$object->trueWeight = trim(GETPOST('trueWeight','int')); $object->trueWeight = trim(GETPOST('trueWeight','int'));
$object->weight_units = GETPOST('weight_units','int'); $object->weight_units = GETPOST('weight_units','int');
@ -1692,8 +1692,8 @@ else if ($id || $ref)
print '</tr>'; print '</tr>';
// Tracking Number // Tracking Number
print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'trackingnumber',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">'; print '<tr><td class="titlefield">'.$form->editfieldkey("TrackingNumber",'tracking_number',$object->tracking_number,$object,$user->rights->expedition->creer).'</td><td colspan="3">';
print $form->editfieldval("TrackingNumber",'trackingnumber',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number); print $form->editfieldval("TrackingNumber",'tracking_number',$object->tracking_url,$object,$user->rights->expedition->creer,'string',$object->tracking_number);
print '</td></tr>'; print '</td></tr>';
// Incoterms // Incoterms

5
htdocs/theme/eldy/style.css.php
View File

@ -3472,17 +3472,20 @@ td.gtaskname {
/* ============================================================================== */ /* ============================================================================== */
/* jQuery - jeditable */ /* jQuery - jeditable for inline edit */
/* ============================================================================== */ /* ============================================================================== */
.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete { .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat; background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat;
cursor: pointer; cursor: pointer;
margin-right: 3px;
} }
.editkey_datepicker { .editkey_datepicker {
background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat; background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat;
margin-right: 3px;
cursor: pointer; cursor: pointer;
margin-right: 3px;
} }
.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover { .editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover {

4
htdocs/theme/md/style.css.php
View File

@ -3542,17 +3542,19 @@ td.gtaskname {
/* ============================================================================== */ /* ============================================================================== */
/* jQuery - jeditable */ /* jQuery - jeditable for inline edit */
/* ============================================================================== */ /* ============================================================================== */
.editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete { .editkey_textarea, .editkey_ckeditor, .editkey_string, .editkey_email, .editkey_numeric, .editkey_select, .editkey_autocomplete {
background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat; background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/edit.png',1) ?>) right top no-repeat;
cursor: pointer; cursor: pointer;
margin-right: 3px;
} }
.editkey_datepicker { .editkey_datepicker {
background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat; background: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/calendar.png',1) ?>) right center no-repeat;
cursor: pointer; cursor: pointer;
margin-right: 3px;
} }
.editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover { .editval_textarea.active:hover, .editval_ckeditor.active:hover, .editval_string.active:hover, .editval_email.active:hover, .editval_numeric.active:hover, .editval_select.active:hover, .editval_autocomplete.active:hover, .editval_datepicker.active:hover {