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

Fix: change for external modules

Browse Source 
Fix: add osx files in gitignore
This commit is contained in:
Regis Houssin
2011-11-05 00:19:04 +08:00
parent 4dc318c9fd
commit 4482c6ac0a
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -11,3 +11,4 @@ default.properties
dolibarr_install.log dolibarr_install.log
doxygen_warnings.log doxygen_warnings.log
/.project /.project
.DS_Store

6
htdocs/core/ajax/loadinplace.php
View File

@@ -50,6 +50,12 @@ if((isset($_GET['field']) && ! empty($_GET['field']))
$fk_element = GETPOST('fk_element'); $fk_element = GETPOST('fk_element');
$type = GETPOST('type'); $type = GETPOST('type');
if (preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
{
$element = $regs[1];
$subelement = $regs[2];
}
if ($element == 'fichinter') $element = 'ficheinter'; if ($element == 'fichinter') $element = 'ficheinter';
if ($user->rights->$element->lire || $user->rights->$element->read) if ($user->rights->$element->lire || $user->rights->$element->read)

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

@@ -56,6 +56,12 @@ if((isset($_POST['field']) && ! empty($_POST['field']))
$return=array(); $return=array();
$error=0; $error=0;
if (preg_match('/^([^_]+)_([^_]+)/i',$element,$regs))
{
$element = $regs[1];
$subelement = $regs[2];
}
if ($element == 'fichinter') $element = 'ficheinter'; if ($element == 'fichinter') $element = 'ficheinter';
if ($user->rights->$element->creer || $user->rights->$element->write) if ($user->rights->$element->creer || $user->rights->$element->write)

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

@@ -7,9 +7,9 @@
$(document).ready(function() { $(document).ready(function() {
var element = $('#element').html(); var element = $('#jeditable_element').html();
var table_element = $('#table_element').html(); var table_element = $('#jeditable_table_element').html();
var fk_element = $('#fk_element').html(); var fk_element = $('#jeditable_fk_element').html();
$('.edit_textarea').editable(urlSaveInPlace, { $('.edit_textarea').editable(urlSaveInPlace, {
type : 'textarea', type : 'textarea',
@@ -131,7 +131,7 @@ $(document).ready(function() {
id : 'field', id : 'field',
onblur : 'ignore', onblur : 'ignore',
tooltip : tooltipInPlace, tooltip : tooltipInPlace,
placeholder : placeholderInPlace, placeholder : ' ',
cancel : cancelInPlace, cancel : cancelInPlace,
submit : submitInPlace, submit : submitInPlace,
indicator : indicatorInPlace, indicator : indicatorInPlace,

6
htdocs/core/lib/functions.lib.php
View File

@@ -594,9 +594,9 @@ function dol_get_fiche_head($links=array(), $active='0', $title='', $notab=0, $p
// Parameters for edit in place // Parameters for edit in place
if (! empty($GLOBALS['object'])) if (! empty($GLOBALS['object']))
{ {
$out.='<div id="element" class="hidden">'.$GLOBALS['object']->element.'</div>'."\n"; $out.='<div id="jeditable_element" class="hidden">'.$GLOBALS['object']->element.'</div>'."\n";
$out.='<div id="table_element" class="hidden">'.$GLOBALS['object']->table_element.'</div>'."\n"; $out.='<div id="jeditable_table_element" class="hidden">'.$GLOBALS['object']->table_element.'</div>'."\n";
$out.='<div id="fk_element" class="hidden">'.$GLOBALS['object']->id.'</div>'."\n"; $out.='<div id="jeditable_fk_element" class="hidden">'.$GLOBALS['object']->id.'</div>'."\n";
} }
return $out; return $out;