Skip to content

Commit

Permalink
Evarisk#1963 [Risk] fix: CSS for multiselect array
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolas-eoxia committed Apr 12, 2024
1 parent f04d942 commit aaa054e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions admin/config/riskassessmentdocument.php
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,11 @@
'name' => 'RiskListParentView',
'description' => 'RiskListParentViewDescription',
'code' => 'DIGIRISKDOLIBARR_RISK_LIST_PARENT_VIEW',
],
'CategoryOnRisk' => [
'name' => 'CategoryOnRisk',
'description' => 'CategoryOnRiskDescription',
'code' => 'DIGIRISKDOLIBARR_CATEGORY_ON_RISK',
],
'ShowInheritedRisksInDocuments' => [
'name' => 'ShowInheritedRisksInDocuments',
Expand All @@ -210,11 +215,6 @@
'code' => 'DIGIRISKDOLIBARR_SHOW_SHARED_RISKS',
'disabled' => !$areRisksSharable
],
'CategoryOnRisk' => [
'name' => 'CategoryOnRisk',
'description' => 'CategoryOnRiskDescription',
'code' => 'DIGIRISKDOLIBARR_CATEGORY_ON_RISK',
],
];

require __DIR__ . '/../../../saturne/core/tpl/admin/object/object_const_view.tpl.php';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
print '<div class="risk-categories"><span class="title">'.$langs->trans("Categories") . '</span>';
$categoryArborescence = $form->select_all_categories('risk', '', 'parent', 64, 0, 1);
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $categoryArborescence, GETPOST('categories', 'array'), '', 0, 'maxwidth300');
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $categoryArborescence, GETPOST('categories', 'array'), '', 0, 'minwidth100imp widthcentpercentminusxx maxwidth400');
print '<a class="butActionNew" href="' . DOL_URL_ROOT . '/categories/index.php?type=risk&backtopage=' . urlencode($_SERVER['PHP_SELF'] . '?action=create') . '" target="_blank"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans('AddCategories') . '"></span></a>';
print "</div>";
}
Expand Down Expand Up @@ -855,7 +855,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
if (!empty($conf->categorie->enabled) && getDolGlobalInt('DIGIRISKDOLIBARR_CATEGORY_ON_RISK') > 0) {
print '<div class="risk-categories"><span class="title">'.$langs->trans("Categories") . '</span>';
$categoryArborescence = $form->select_all_categories('risk', '', 'parent', 64, 0, 1);
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $categoryArborescence, GETPOST('categories', 'array'), '', 0, 'maxwidth300');
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories', $categoryArborescence, GETPOST('categories', 'array'), '', 0, 'minwidth100imp widthcentpercentminusxx maxwidth400');
print '<a class="butActionNew" href="' . DOL_URL_ROOT . '/categories/index.php?type=risk&backtopage=' . urlencode($_SERVER['PHP_SELF'] . '?action=create') . '" target="_blank"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans('AddCategories') . '"></span></a>';
print "</div><hr>";
} ?>
Expand Down Expand Up @@ -1327,7 +1327,7 @@ class="risk-evaluation-cotation cotation"><?php echo $shownCotation; ?></div>
$arrayselected[] = $cat->id;
}
}
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories_risk' . $risk->id, $categoryArborescence, $arrayselected, '', 0, 'maxwidth300');
print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('categories_risk' . $risk->id, $categoryArborescence, $arrayselected, '', 0, 'minwidth100imp widthcentpercentminusxx maxwidth400');
print '<a class="butActionNew" href="' . DOL_URL_ROOT . '/categories/index.php?type=risk&backtopage=' . urlencode($_SERVER['PHP_SELF'] . '?action=create') . '" target="_blank"><span class="fa fa-plus-circle valignmiddle paddingleft" title="' . $langs->trans('AddCategories') . '"></span></a>';
print '</div><hr>';
} ?>
Expand Down
2 changes: 1 addition & 1 deletion langs/fr_FR/digiriskdolibarr.lang
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@ DefaultTaskContactType = Rôle par défaut attribué aux tâch
RiskListParentView = Afficher tous les éléments parents
RiskListParentViewDescription = Afficher tous les éléments parents d'un risque dans la liste des risques
CategoryOnRisk = Afficher les tags/catégories sur les risques
CategoryOnRiskDescription = Permet d'attribuer des tags/catégories aux risques et de les afficher - à minipuler avec précaution.
CategoryOnRiskDescription = Permet d'attribuer des tags/catégories aux risques et de les afficher - à manipuler avec précaution

# Stats - Statistiques
GreyRisk = Risque faible
Expand Down

0 comments on commit aaa054e

Please sign in to comment.