DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 00:37:39 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source 
# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2017-12-04 23:51:53 -08:00
parent 4f3c932bb1 28fdbdd5d8
commit 244eceadec
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Console/Commands/SyncAssetLocations.php
View file

@ -109,7 +109,7 @@ class SyncAssetLocations extends Command
$assigned_asset_asset->unsetEventDispatcher();
$assigned_asset_asset->save();
} else {
$output['warn'][] ='Asset Assigned asset ' . $assigned_asset_asset->assetLoc()->id. ' ('.$assigned_asset_asset->asset_tag.') does not seem to have a valid location';
$output['warn'][] ='Asset Assigned asset ' . $assigned_asset_asset->id. ' ('.$assigned_asset_asset->asset_tag.') does not seem to have a valid location';
}
$bar->advance();

7
app/Models/Asset.php
View file

@ -257,13 +257,10 @@ class Asset extends Depreciable
/**
* Get the asset's location based on the assigned user
**/
public function assetLoc()
public function assetLoc($iterations = 1,$first_asset = null)
{
static $iterations=0;
static $first_asset;
if (!empty($this->assignedType())) {
if ($this->assignedType() == self::ASSET) {
$iterations++;
if(!$first_asset) {
$first_asset=$this;
}
@ -272,7 +269,7 @@ class Asset extends Depreciable
}
$assigned_to=Asset::find($this->assigned_to); //have to do this this way because otherwise it errors
if ($assigned_to) {
return $assigned_to->assetLoc();
return $assigned_to->assetLoc($iterations + 1, $first_asset);
} // Recurse until we have a final location
}
if ($this->assignedType() == self::LOCATION) {

12
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v4.1.6',
'full_app_version' => 'v4.1.6 - build 2994-g83c8449',
'build_version' => '2994',
'app_version' => 'v4.1.7',
'full_app_version' => 'v4.1.7 - build 3031-g4f3c932',
'build_version' => '3031',
'prerelease_version' => '',
'hash_version' => 'g83c8449',
'full_hash' => 'v4.1.6-2994-g83c8449',
'branch' => 'master'
'hash_version' => 'g4f3c932',
'full_hash' => 'v4.1.6-37-g4f3c932',
'branch' => 'master',
);