From 1f7bc1d5181023e5ed208287c3803f94e2dc20a5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Jul 2016 02:06:46 +0200
Subject: [PATCH] FIX Bad sort link on ECM module for automatic tab
---
htdocs/core/ajax/ajaxdirpreview.php | 5 +++--
htdocs/ecm/index_auto.php | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index f1352f8e933..5827b846be9 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -82,6 +82,7 @@ else // For no ajax call
$relativepath=$ecmdir->getRelativePath();
$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
}
+if (empty($url)) $url=DOL_URL_ROOT.'/ecm/index.php';
// Load traductions files
$langs->load("ecm");
@@ -138,10 +139,10 @@ if (! dol_is_dir($upload_dir))
}
print '<!-- TYPE='.$type.' -->'."\n";
-print '<!-- Page called with mode='.(isset($mode)?$mode:'').' type='.$type.' module='.$module.' url='.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
+print '<!-- Page called with mode='.(isset($mode)?$mode:'').' type='.$type.' module='.$module.' url='.$url.' '.$_SERVER["PHP_SELF"].'?'.$_SERVER["QUERY_STRING"].' -->'."\n";
$param=($sortfield?'&sortfield='.$sortfield:'').($sortorder?'&sortorder='.$sortorder:'');
-$url=DOL_URL_ROOT.'/ecm/index.php';
+
// Dir scan
if ($type == 'directory')
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index c6944065b3a..fd4f71c224e 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -574,6 +574,7 @@ if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$acti
$mode='noajax';
+$url=DOL_URL_ROOT.'/ecm/index_auto.php';
include_once DOL_DOCUMENT_ROOT.'/core/ajax/ajaxdirpreview.php';
--
GitLab