';
@@ -770,14 +771,14 @@ class FormFile
print '';
print img_mime($file['name'],$file['name'].' ('.dol_print_size($file['size'],0,0).')').' ';
@@ -800,14 +801,16 @@ class FormFile
// Delete or view link
// ($param must start with &)
print '| ';
- if ($useinecm) print ''.img_view().' ';
+ if ($useinecm) print ''.img_view().' ';
if ($permtodelete)
{
+ /*
if ($file['level1name'] <> $object->id)
- $filepath=urlencode($file['level1name'].'/'.$file['name']);
+ $filepath=$file['level1name'].'/'.$file['name'];
else
- $filepath=urlencode($file['name']);
- print ''.img_delete().'';
+ $filepath=$file['name'];
+ */
+ print ''.img_delete().'';
}
else print ' ';
print " | ";
@@ -831,7 +834,7 @@ class FormFile
/**
* Show list of documents in a directory
*
- * @param string $upload_dir Directory that was scanned
+ * @param string $upload_dir Directory that was scanned
* @param array $filearray Array of files loaded by dol_dir_list function before calling this function
* @param string $modulepart Value for modulepart used by download wrapper
* @param string $param Parameters on sort links
@@ -841,7 +844,7 @@ class FormFile
* @param int $useinecm Change output for use in ecm module
* @param int $textifempty Text to show if filearray is empty
* @param int $maxlength Maximum length of file name shown
- * @param string $url Full url to use for click links ('' = autodetect)
+ * @param string $url Full url to use for click links ('' = autodetect)
* @return int <0 if KO, nb of files shown if OK
*/
function list_of_autoecmfiles($upload_dir,$filearray,$modulepart,$param,$forcedownload=0,$relativepath='',$permtodelete=1,$useinecm=0,$textifempty='',$maxlength=0,$url='')
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 5368c1b52be..531138aaab9 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -53,6 +53,7 @@ $action=GETPOST("action");
$section=GETPOST("section")?GETPOST("section","int"):GETPOST("section_id","int");
$module=GETPOST("module");
if (! $section) $section=0;
+$section_dir=GETPOST('section_dir');
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
@@ -93,7 +94,7 @@ if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
// Define relativepath and upload_dir
$relativepath='';
if ($ecmdir->id) $relativepath=$ecmdir->getRelativePath();
- else $relativepath=GETPOST('section_dir');
+ else $relativepath=$section_dir;
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
if (empty($_FILES['userfile']['tmp_name']))
@@ -167,16 +168,20 @@ if ($action == 'confirm_deletefile')
{
if (GETPOST('confirm') == 'yes')
{
- $langs->load("other");
- $result=$ecmdir->fetch($section);
- if (! ($result > 0))
+ $langs->load("other");
+ if ($section)
{
- dol_print_error($db,$ecmdir->error);
- exit;
+ $result=$ecmdir->fetch($section);
+ if (! ($result > 0))
+ {
+ dol_print_error($db,$ecmdir->error);
+ exit;
+ }
+ $relativepath=$ecmdir->getRelativePath();
}
- $relativepath=$ecmdir->getRelativePath();
- $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
- $file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP).
+ else $relativepath='';
+ $upload_dir = $conf->ecm->dir_output.($relativepath?'/'.$relativepath:'');
+ $file = $upload_dir . "/" . GETPOST('urlfile'); // Do not use urldecode here ($_GET and $_POST are already decoded by PHP).
$ret=dol_delete_file($file);
if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
@@ -391,7 +396,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'order_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersOrders"), 'desc'=>$langs->trans("ECMDocsByOrders")); }
if (! empty($conf->fournisseur->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'invoice_supplier', 'test'=>$conf->fournisseur->enabled, 'label'=>$langs->trans("SuppliersInvoices"), 'desc'=>$langs->trans("ECMDocsByInvoices")); }
if (! empty($conf->tax->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBySocialContributions")); }
- if (! empty($conf->projet->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
+ if (! empty($conf->projet->enabled)) { $rowspan++; $sectionauto[]=array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsByProjects")); }
}
print_fiche_titre($langs->trans("ECMArea").' - '.$langs->trans("ECMFileManager"));
@@ -461,7 +466,6 @@ if ($action == 'delete_section')
// End confirm
-
if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
{
print '';
@@ -774,8 +778,19 @@ include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
// To attach new file
if ((! empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) || ! empty($section))
{
+ if (empty($section) || $section == -1)
+ {
+ ?>
+
+ form_attach_new_file(DOL_URL_ROOT.'/ecm/index.php', 'none', 0, ($section?$section:-1), $user->rights->ecm->upload, 48, null, '', 0, '', 0);
+ $formfile->form_attach_new_file(DOL_URL_ROOT.'/ecm/index.php', 'none', 0, ($section?$section:-1), $user->rights->ecm->upload, 48, null, '', 0, '', 0, 'formuserfile');
}
else print ' ';
@@ -789,6 +804,8 @@ else print ' ';
use_javascript_ajax) && empty($conf->global->MAIN_ECM_DISABLE_JS)) {
include 'tpl/builddatabase.tpl.php';
}
diff --git a/htdocs/ecm/tpl/builddatabase.tpl.php b/htdocs/ecm/tpl/builddatabase.tpl.php
index 7f997ed6209..4d5c0ab953a 100644
--- a/htdocs/ecm/tpl/builddatabase.tpl.php
+++ b/htdocs/ecm/tpl/builddatabase.tpl.php
@@ -13,28 +13,39 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
- *
+ *
+ * Output javascript for interactions code of ecm module
*/
-
-$openeddir='/';
-
-// TODO: just use ajaxdirtree.php for load database after ajax refresh and not scan directories
-// too slow every page loaded !
-
?>
-
+
+
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
index c9b0e3853df..390f71cda16 100755
--- a/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
+++ b/htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js
@@ -33,7 +33,7 @@
if(jQuery) (function($){
$.extend($.fn, {
- fileTree: function(o, h) {
+ fileTree: function(o, h, hd) { // CHANGE DOL_LDR add hd param
// Defaults
if( !o ) var o = {};
if( o.root == undefined ) o.root = '/';
@@ -77,6 +77,8 @@ if(jQuery) (function($){
$(this).parent().find('UL').slideUp({ duration: o.collapseSpeed, easing: o.collapseEasing });
$(this).parent().removeClass('expanded').addClass('collapsed');
}
+ // CHANGE DOL_LDR use hd function provided in param
+ if (hd != null) hd($(this));
} else {
h($(this).attr('rel'));
}