DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

gives priority to default eula being checked vs catregory eula

Browse source
This commit is contained in:
Godfrey M 2024-09-03 12:23:23 -07:00
parent e1fcfc8dc1
commit cf07186ae8
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Models/Asset.php
View file

@ -950,11 +950,12 @@ class Asset extends Depreciable
{ {
if (($this->model) && ($this->model->category)) { if (($this->model) && ($this->model->category)) {
if ($this->model->category->eula_text) { if (($this->model->category->eula_text) && ($this->model->category->use_default_eula === 0)) {
return Helper::parseEscapedMarkedown($this->model->category->eula_text); return Helper::parseEscapedMarkedown($this->model->category->eula_text);
} elseif ($this->model->category->use_default_eula == '1') { } elseif ($this->model->category->use_default_eula === 1) {
return Helper::parseEscapedMarkedown(Setting::getSettings()->default_eula_text); return Helper::parseEscapedMarkedown(Setting::getSettings()->default_eula_text);
} else { } else {
return false; return false;
} }
} }