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

Fix: possibility to use with another element

Browse Source
This commit is contained in:
Regis Houssin 2012-09-07 13:47:35 +02:00
parent 847a335ee5
commit ab5e4db9c0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/ecm/ajax/ecmdatabase.php
View File

@ -31,6 +31,7 @@ require '../../main.inc.php';
require DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
$action = GETPOST('action','alpha');
$element = GETPOST('element', 'alpha');
/*
* View
@ -45,7 +46,7 @@ if (isset($action) && ! empty($action))
{
$error=0;
if ($action == 'build')
if ($action == 'build' && ! empty($element))
{
require DOL_DOCUMENT_ROOT . '/ecm/class/ecmdirectory.class.php';
@ -53,11 +54,11 @@ if (isset($action) && ! empty($action))
clearstatcache();
$diroutputslash=str_replace('\\', '/', $conf->ecm->dir_output);
$diroutputslash=str_replace('\\', '/', $conf->$element->dir_output);
$diroutputslash.='/';
// Scan directory tree on disk
$disktree=dol_dir_list($conf->ecm->dir_output,'directories',1,'',array('^temp$'),'','',0);
$disktree=dol_dir_list($conf->$element->dir_output,'directories',1,'',array('^temp$'),'','',0);
// Scan directory tree in database
$sqltree=$ecmdirstatic->get_full_arbo(0);
@ -74,7 +75,7 @@ if (isset($action) && ! empty($action))
$dirisindatabase=0;
foreach($sqltree as $dirsqldesc)
{
if ($conf->ecm->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
if ($conf->$element->dir_output.'/'.$dirsqldesc['fullrelativename'] == $dirdesc['fullname'])
{
$dirisindatabase=1;
break;

3
htdocs/ecm/tpl/builddatabase.tpl.php
View File

@ -70,7 +70,8 @@ function loadandshowpreview(filedirname,section)
ecmBuildDatabase = function() {
$.pleaseBePatient("<?php echo $langs->trans('PleaseBePatient'); ?>");
$.getJSON( "<?php echo DOL_URL_ROOT . '/ecm/ajax/ecmdatabase.php'; ?>", {
action: "build"
action: "build",
element: "ecm"
},
function(response) {
$.unblockUI();