Merge pull request #2049 from rkerviel/fix_permission_for_generate_doc

[Documents] fix: permission for generate documents
Evarisk · Jul 20, 2022 · 89c9898 · 89c9898
2 parents 28aaf04 + 5801146
commit 89c9898
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 9 deletions.
diff --git a/view/accident/accident_card.php b/view/accident/accident_card.php
@@ -1311,7 +1311,11 @@
 		$defaultmodel = $conf->global->DIGIRISKDOLIBARR_ACCIDENTDOCUMENT_DEFAULT_MODEL;
 		$title        = $langs->trans('AccidentDocument');
 
-		print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, $permissiontodelete, $defaultmodel, 1, 0, '', $title, '', '', $accidentdocument, 0, 'remove_file', $object->status == 3 ? true : false, $langs->trans('AccidentMustBeLocked'));
+		if ($permissiontoadd || $permissiontoread) {
+			$genallowed = 1;
+		}
+
+		print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, $permissiontodelete, $defaultmodel, 1, 0, '', $title, '', '', $accidentdocument, 0, 'remove_file', $object->status == 3 ? true : false, $langs->trans('AccidentMustBeLocked'));
 	}
 
 	if ($permissiontoadd) {

diff --git a/view/digiriskelement/digiriskelement_card.php b/view/digiriskelement/digiriskelement_card.php
@@ -520,7 +520,11 @@
 				$title        = $langs->trans('WorkUnitDocument');
 			}
 
-			print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, $permissiontodelete, $defaultmodel, 1, 0, '', $title, '', '', $digiriskelementdocument);
+			if ($permissiontoadd || $permissiontoread) {
+				$genallowed = 1;
+			}		
+
+			print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, $permissiontodelete, $defaultmodel, 1, 0, '', $title, '', '', $digiriskelementdocument);
 		}
 
 

diff --git a/view/digiriskelement/digiriskelement_listingrisksaction.php b/view/digiriskelement/digiriskelement_listingrisksaction.php
@@ -251,7 +251,11 @@
 
 	$modulepart = 'digiriskdolibarr:ListingRisksAction';
 
-	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_LISTINGRISKSACTION_DEFAULT_MODEL, 1, 0, '', $langs->trans('ListingRisksAction'), '', '', $listingrisksaction);
+	if ($permissiontoadd || $permissiontoread) {
+		$genallowed = 1;
+	}
+
+	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_LISTINGRISKSACTION_DEFAULT_MODEL, 1, 0, '', $langs->trans('ListingRisksAction'), '', '', $listingrisksaction);
 }
 
 // End of page

diff --git a/view/digiriskelement/digiriskelement_listingrisksphoto.php b/view/digiriskelement/digiriskelement_listingrisksphoto.php
@@ -251,7 +251,11 @@
 
 	$modulepart = 'digiriskdolibarr:ListingRisksPhoto';
 
-	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_LISTINGRISKSPHOTO_DEFAULT_MODEL, 1, 0, '', $langs->trans('ListingRisksPhoto'), '', '', $listingrisksphoto);
+	if ($permissiontoadd || $permissiontoread) {
+		$genallowed = 1;
+	}
+
+	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_LISTINGRISKSPHOTO_DEFAULT_MODEL, 1, 0, '', $langs->trans('ListingRisksPhoto'), '', '', $listingrisksphoto);
 }
 
 // End of page

diff --git a/view/digiriskstandard/digiriskstandard_informationssharing.php b/view/digiriskstandard/digiriskstandard_informationssharing.php
@@ -197,7 +197,11 @@
 	$urlsource  = $_SERVER["PHP_SELF"];
 	$modulepart = 'digiriskdolibarr:InformationsSharing';
 
-	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_INFORMATIONSSHARING_DEFAULT_MODEL, 1, 0, '', $langs->trans('InformationsSharing'), '', '', $informationssharing);
+	if ($permissiontoadd || $permissiontoread) {
+		$genallowed = 1;
+	}
+
+	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_INFORMATIONSSHARING_DEFAULT_MODEL, 1, 0, '', $langs->trans('InformationsSharing'), '', '', $informationssharing);
 }
 
 // End of page

diff --git a/view/digiriskstandard/digiriskstandard_legaldisplay.php b/view/digiriskstandard/digiriskstandard_legaldisplay.php
@@ -196,7 +196,11 @@
 	$urlsource  = $_SERVER["PHP_SELF"];
 	$modulepart = 'digiriskdolibarr:LegalDisplay';
 
-	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_LEGALDISPLAY_DEFAULT_MODEL, 1, 0, '', $langs->trans('LegalDisplay'), '', '', $legaldisplay);
+	if ($permissiontoadd || $permissiontoread) {
+		$genallowed = 1;
+	}
+
+	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_LEGALDISPLAY_DEFAULT_MODEL, 1, 0, '', $langs->trans('LegalDisplay'), '', '', $legaldisplay);
 }
 
 // End of page

diff --git a/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php b/view/digiriskstandard/digiriskstandard_riskassessmentdocument.php
@@ -437,7 +437,11 @@
 	$urlsource  = $_SERVER["PHP_SELF"];
 	$modulepart = 'digiriskdolibarr:RiskAssessmentDocument';
 
-	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_DEFAULT_MODEL, 1, 0, '', $langs->trans('RiskAssessmentDocument'), '', '', $riskassessmentdocument, 0, 'remove_file');
+	if ($permissiontoadd || $permissiontoread) {
+		$genallowed = 1;
+	}
+
+	print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, $permissiontodelete, $conf->global->DIGIRISKDOLIBARR_RISKASSESSMENTDOCUMENT_DEFAULT_MODEL, 1, 0, '', $langs->trans('RiskAssessmentDocument'), '', '', $riskassessmentdocument, 0, 'remove_file');
 }
 
 // Presend form

diff --git a/view/firepermit/firepermit_card.php b/view/firepermit/firepermit_card.php
@@ -1440,7 +1440,11 @@ class="attachment-thumbail size-thumbnail photo photowithmargin" alt="">
 		$defaultmodel = $conf->global->DIGIRISKDOLIBARR_FIREPERMITDOCUMENT_DEFAULT_MODEL;
 		$title        = $langs->trans('FirePermitDocument');
 
-		print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, 0, $defaultmodel, 1, 0, '', $title, '', '', $firepermitdocument, 0, 'remove_file', $object->status == 3 && empty(dol_dir_list($filedir)), $langs->trans('FirePermitMustBeLocked'));
+		if ($permissiontoadd || $permissiontoread) {
+			$genallowed = 1;
+		}	
+
+		print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, 0, $defaultmodel, 1, 0, '', $title, '', '', $firepermitdocument, 0, 'remove_file', $object->status == 3 && empty(dol_dir_list($filedir)), $langs->trans('FirePermitMustBeLocked'));
 	}
 
 	if ($permissiontoadd) {

diff --git a/view/preventionplan/preventionplan_card.php b/view/preventionplan/preventionplan_card.php
@@ -1414,7 +1414,11 @@ class="attachment-thumbail size-thumbnail photo photowithmargin" alt="">
 		$defaultmodel = $conf->global->DIGIRISKDOLIBARR_PREVENTIONPLANDOCUMENT_DEFAULT_MODEL;
 		$title        = $langs->trans('PreventionPlanDocument');
 
-		print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $permissiontoadd, 0, $defaultmodel, 1, 0, '', $title, '', '', $preventionplandocument, 0, 'remove_file', $object->status == 3 && empty(dol_dir_list($filedir)), $langs->trans('PreventionPlanMustBeLocked'));
+		if ($permissiontoadd || $permissiontoread) {
+			$genallowed = 1;
+		}	
+
+		print digiriskshowdocuments($modulepart, $dir_files, $filedir, $urlsource, $genallowed, 0, $defaultmodel, 1, 0, '', $title, '', '', $preventionplandocument, 0, 'remove_file', $object->status == 3 && empty(dol_dir_list($filedir)), $langs->trans('PreventionPlanMustBeLocked'));
 	}
 
 	if ($permissiontoadd) {