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

Fixed case for userloc

Browse source
This commit is contained in:
snipe 2017-06-08 18:46:07 -07:00
parent 2aaa635345
commit 58b2834c54
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Http/Controllers/AssetsController.php
View file

@ -588,9 +588,7 @@ class AssetsController extends Controller
if (isset($asset->id)) { if (isset($asset->id)) {
if ($asset->userloc) { if ($asset->assetloc) {
$use_currency = $asset->userloc->currency;
} elseif ($asset->assetloc) {
$use_currency = $asset->assetloc->currency; $use_currency = $asset->assetloc->currency;
} else { } else {

2
app/Models/Asset.php
View file

@ -273,7 +273,7 @@ class Asset extends Depreciable
public function assetLoc() public function assetLoc()
{ {
if ($this->assignedTo) { if ($this->assignedTo) {
return $this->assignedTo->userLoc(); return $this->assignedTo->userloc();
} }
if (!empty($this->assignedType())) { if (!empty($this->assignedType())) {