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

Merge pull request #12600 from TobiasSekan/FixEcmSymbolsAccess

Browse Source 
Fix shown ECM symbols on missing access
This commit is contained in:
Laurent Destailleur 2019-12-03 13:21:42 +01:00 committed by GitHub
commit 8f39fec121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
htdocs/core/ajax/ajaxdirpreview.php
View File

@ -289,25 +289,49 @@ if ($type == 'directory')
} }
else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection")); else $textifempty=($showonrightsize=='featurenotyetavailable'?$langs->trans("FeatureNotYetAvailable"):$langs->trans("ECMSelectASection"));
if ($module == 'medias') if ($module == 'medias')
{ {
$useinecm = 6; $useinecm = 6;
$modulepart='medias'; $modulepart='medias';
$perm=($user->rights->website->write || $user->rights->emailing->creer); $perm=($user->rights->website->write || $user->rights->emailing->creer);
$title='none'; $title='none';
} }
else elseif($module == 'ecm') // DMS/ECM -> manual structure
{ {
$useinecm = 5; if($user->rights->ecm->read)
$modulepart='ecm'; {
$perm=$user->rights->ecm->upload; // Buttons: Preview
$title=''; // Use default $useinecm = 2;
} }
// When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param if($user->rights->ecm->upload)
// When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath {
//var_dump("title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url); // Buttons: Preview + Delete
$formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm); $useinecm = 4;
}
if($user->rights->ecm->setup)
{
// Buttons: Preview + Delete + Edit
$useinecm = 5;
}
$perm=$user->rights->ecm->upload;
$modulepart='ecm';
$title=''; // Use default
}
else
{
$useinecm = 5;
$modulepart='ecm';
$perm=$user->rights->ecm->upload;
$title=''; // Use default
}
// When we show list of files for ECM files, $filearray contains file list, and directory is defined with modulepart + section into $param
// When we show list of files for a directory, $filearray ciontains file list, and directory is defined with modulepart + $relativepath
//var_dump("title=".$title." modulepart=".$modulepart." useinecm=".$useinecm." perm=".$perm." relativepath=".$relativepath." param=".$param." url=".$url);
$formfile->list_of_documents($filearray, '', $modulepart, $param, 1, $relativepath, $perm, $useinecm, $textifempty, $maxlengthname, $title, $url, 0, $perm);
} }
} }