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

FIX The include file for action on files should not be a template file

Browse Source 
but an action include file.
This commit is contained in:
Laurent Destailleur 2016-04-02 14:16:16 +02:00
parent 66f9f0d046
commit e1bec46a34
24 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/document.php
View File

@ -76,7 +76,7 @@ $upload_dir = $conf->adherent->dir_output . "/" . get_exdir($object->id,2,0,1,$o
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/comm/action/document.php
View File

@ -81,7 +81,7 @@ $modulepart='contract';
/* /*
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/comm/propal/document.php
View File

@ -67,7 +67,7 @@ if ($object->id > 0)
{ {
$object->fetch_thirdparty(); $object->fetch_thirdparty();
$upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref); $upload_dir = $conf->propal->dir_output.'/'.dol_sanitizeFileName($object->ref);
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
} }
/* /*

2
htdocs/commande/document.php
View File

@ -72,7 +72,7 @@ if ($object->fetch($id))
$upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref); $upload_dir = $conf->commande->dir_output . "/" . dol_sanitizeFileName($object->ref);
} }
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/compta/deplacement/document.php
View File

@ -72,7 +72,7 @@ $modulepart='trip';
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/compta/facture/document.php
View File

@ -75,7 +75,7 @@ if ($object->fetch($id))
/* /*
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/compta/salaries/document.php
View File

@ -72,7 +72,7 @@ $modulepart='salaries';
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/compta/sociales/document.php
View File

@ -73,7 +73,7 @@ $modulepart='tax';
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/contact/document.php
View File

@ -65,7 +65,7 @@ $modulepart='contact';
* Actions * Actions
*/ */
include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/contrat/document.php
View File

@ -77,7 +77,7 @@ $modulepart='contract';
/* /*
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

4
htdocs/core/tpl/document_actions_pre_headers.tpl.php → htdocs/core/actions_linkedfiles.inc.php
View File

@ -19,10 +19,6 @@
*/ */
// TODO This is an action include, not a presentation template.
// Move this file into htdocs/core/actions_document.inc.php
// Variable $upload_dir must be defined when entering here // Variable $upload_dir must be defined when entering here
// Variable $upload_dirold may also exists. // Variable $upload_dirold may also exists.

2
htdocs/don/document.php
View File

@ -72,7 +72,7 @@ $modulepart='don';
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/expensereport/document.php
View File

@ -72,7 +72,7 @@ $modulepart='trip';
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/fichinter/document.php
View File

@ -72,7 +72,7 @@ $modulepart='fichinter';
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/fourn/commande/document.php
View File

@ -78,7 +78,7 @@ $object->fetch_thirdparty();
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/fourn/facture/document.php
View File

@ -72,7 +72,7 @@ if ($object->fetch($id, $ref))
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/holiday/document.php
View File

@ -72,7 +72,7 @@ $modulepart='holiday';
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/loan/document.php
View File

@ -66,7 +66,7 @@ $modulepart='loan';
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/product/document.php
View File

@ -111,7 +111,7 @@ if (empty($reshook))
} }
// Action sending file // Action sending file
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
} }

2
htdocs/projet/document.php
View File

@ -70,7 +70,7 @@ if (! $sortfield) $sortfield="name";
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/projet/tasks/document.php
View File

@ -108,7 +108,7 @@ if ($id > 0 || ! empty($ref))
} }
} }
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/societe/document.php
View File

@ -74,7 +74,7 @@ if ($id > 0 || ! empty($ref))
* Actions * Actions
*/ */
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
/* /*

2
htdocs/supplier_proposal/document.php
View File

@ -66,7 +66,7 @@ if ($object->id > 0)
{ {
$object->fetch_thirdparty(); $object->fetch_thirdparty();
$upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref); $upload_dir = $conf->supplier_proposal->dir_output.'/'.dol_sanitizeFileName($object->ref);
include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT . '/core/actions_linkedfiles.inc.php';
} }

2
htdocs/user/document.php
View File

@ -105,7 +105,7 @@ $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors'); if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook)) { if (empty($reshook)) {
include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_pre_headers.tpl.php'; include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
} }
/* /*