Debug v17
This commit is contained in:
parent
2cafd2cbc4
commit
6224414b0d
@ -99,6 +99,8 @@ if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $acti
|
|||||||
accessforbidden();
|
accessforbidden();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$permissiontoadd = $user->rights->projet->creer;
|
||||||
|
$permissiontodelete = $user->rights->projet->supprimer;
|
||||||
$permissiondellink = $user->rights->projet->creer; // Used by the include of actions_dellink.inc.php
|
$permissiondellink = $user->rights->projet->creer; // Used by the include of actions_dellink.inc.php
|
||||||
|
|
||||||
|
|
||||||
@ -152,7 +154,20 @@ if (empty($reshook)) {
|
|||||||
|
|
||||||
include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
|
include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
|
||||||
|
|
||||||
if ($action == 'add' && $user->rights->projet->creer) {
|
// Action setdraft object
|
||||||
|
if ($action == 'confirm_setdraft' && $confirm == 'yes' && $permissiontoadd) {
|
||||||
|
$result = $object->setStatut($object::STATUS_DRAFT, null, '', 'PROJECT_MODIFY');
|
||||||
|
if ($result >= 0) {
|
||||||
|
// Nothing else done
|
||||||
|
} else {
|
||||||
|
$error++;
|
||||||
|
setEventMessages($object->error, $object->errors, 'errors');
|
||||||
|
}
|
||||||
|
$action = '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Action add
|
||||||
|
if ($action == 'add' && $permissiontoadd) {
|
||||||
$error = 0;
|
$error = 0;
|
||||||
if (!GETPOST('ref')) {
|
if (!GETPOST('ref')) {
|
||||||
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
|
setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
|
||||||
@ -260,7 +275,7 @@ if (empty($reshook)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($action == 'update' && empty(GETPOST('cancel')) && $user->rights->projet->creer) {
|
if ($action == 'update' && empty(GETPOST('cancel')) && $permissiontoadd) {
|
||||||
$error = 0;
|
$error = 0;
|
||||||
|
|
||||||
if (empty($ref)) {
|
if (empty($ref)) {
|
||||||
@ -376,7 +391,7 @@ if (empty($reshook)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Build doc
|
// Build doc
|
||||||
if ($action == 'builddoc' && $user->rights->projet->creer) {
|
if ($action == 'builddoc' && $permissiontoadd) {
|
||||||
// Save last template used to generate document
|
// Save last template used to generate document
|
||||||
if (GETPOST('model')) {
|
if (GETPOST('model')) {
|
||||||
$object->setDocModel($user, GETPOST('model', 'alpha'));
|
$object->setDocModel($user, GETPOST('model', 'alpha'));
|
||||||
@ -395,7 +410,7 @@ if (empty($reshook)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Delete file in doc form
|
// Delete file in doc form
|
||||||
if ($action == 'remove_file' && $user->rights->projet->creer) {
|
if ($action == 'remove_file' && $permissiontoadd) {
|
||||||
if ($object->id > 0) {
|
if ($object->id > 0) {
|
||||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
|
||||||
|
|
||||||
@ -413,28 +428,28 @@ if (empty($reshook)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if ($action == 'confirm_validate' && $confirm == 'yes') {
|
if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) {
|
||||||
$result = $object->setValid($user);
|
$result = $object->setValid($user);
|
||||||
if ($result <= 0) {
|
if ($result <= 0) {
|
||||||
setEventMessages($object->error, $object->errors, 'errors');
|
setEventMessages($object->error, $object->errors, 'errors');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($action == 'confirm_close' && $confirm == 'yes') {
|
if ($action == 'confirm_close' && $confirm == 'yes' && $permissiontoadd) {
|
||||||
$result = $object->setClose($user);
|
$result = $object->setClose($user);
|
||||||
if ($result <= 0) {
|
if ($result <= 0) {
|
||||||
setEventMessages($object->error, $object->errors, 'errors');
|
setEventMessages($object->error, $object->errors, 'errors');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($action == 'confirm_reopen' && $confirm == 'yes') {
|
if ($action == 'confirm_reopen' && $confirm == 'yes' && $permissiontoadd) {
|
||||||
$result = $object->setValid($user);
|
$result = $object->setValid($user);
|
||||||
if ($result <= 0) {
|
if ($result <= 0) {
|
||||||
setEventMessages($object->error, $object->errors, 'errors');
|
setEventMessages($object->error, $object->errors, 'errors');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($action == 'confirm_delete' && GETPOST("confirm") == "yes" && $user->rights->projet->supprimer) {
|
if ($action == 'confirm_delete' && $confirm == 'yes' && $permissiontodelete) {
|
||||||
$object->fetch($id);
|
$object->fetch($id);
|
||||||
$result = $object->delete($user);
|
$result = $object->delete($user);
|
||||||
if ($result > 0) {
|
if ($result > 0) {
|
||||||
@ -447,7 +462,7 @@ if (empty($reshook)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($action == 'confirm_clone' && $user->rights->projet->creer && $confirm == 'yes') {
|
if ($action == 'confirm_clone' && $permissiontoadd && $confirm == 'yes') {
|
||||||
$clone_contacts = GETPOST('clone_contacts') ? 1 : 0;
|
$clone_contacts = GETPOST('clone_contacts') ? 1 : 0;
|
||||||
$clone_tasks = GETPOST('clone_tasks') ? 1 : 0;
|
$clone_tasks = GETPOST('clone_tasks') ? 1 : 0;
|
||||||
$clone_project_files = GETPOST('clone_project_files') ? 1 : 0;
|
$clone_project_files = GETPOST('clone_project_files') ? 1 : 0;
|
||||||
@ -1483,6 +1498,17 @@ if ($action == 'create' && $user->rights->projet->creer) {
|
|||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
// Back to draft
|
||||||
|
if (!getDolGlobalString('MAIN_DISABLEDRAFTSTATUS') && !getDolGlobalString('MAIN_DISABLEDRAFTSTATUS_PROJECT')) {
|
||||||
|
if ($object->statut != Project::STATUS_DRAFT && $user->rights->projet->creer) {
|
||||||
|
if ($userWrite > 0) {
|
||||||
|
print dolGetButtonAction('', $langs->trans('SetToDraft'), 'default', $_SERVER["PHP_SELF"].'?action=confirm_setdraft&confirm=yes&token='.newToken().'&id='.$object->id, '');
|
||||||
|
} else {
|
||||||
|
print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('SetToDraft'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Modify
|
// Modify
|
||||||
if ($object->statut != Project::STATUS_CLOSED && $user->rights->projet->creer) {
|
if ($object->statut != Project::STATUS_CLOSED && $user->rights->projet->creer) {
|
||||||
if ($userWrite > 0) {
|
if ($userWrite > 0) {
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user