Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #477 - wrong sidebar on asset view #498

Merged
merged 1 commit into from
Feb 9, 2015
Merged

Fixes #477 - wrong sidebar on asset view #498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions app/views/backend/hardware/view.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,10 +279,13 @@
<li><i class="icon-phone"></i> {{{ $asset->assigneduser->phone }}}</li>
@endif


<li><br /><a href="{{ route('checkin/hardware', $asset->id) }}" class="btn-flat large info ">@lang('admin/hardware/general.checkin')</a></li>
</ul>


@elseif (($asset->status_id ) && ($asset->status_id > 1))
<!-- Status ID is greater than 1, Asset is Undeployable-->

@if ($asset->assetstatus)
<h6><br>{{{ $asset->assetstatus->name }}}
Expand All @@ -297,16 +300,14 @@
</div>
@endif


@elseif ($asset->status_id == NULL)
<!-- Status ID is NULL, Asset is pending-->
<h6><br>@lang('admin/hardware/general.pending')</h6>
<div class="col-md-12">
<div class="alert alert-info alert-block">
<i class="icon-info-sign"></i>
@lang('admin/hardware/message.undeployable')
</div>
</div>

@else

@elseif ($asset->status_id == 0)
<!-- Status ID is 0, Asset is RTD -->
<h6><br>@lang('admin/hardware/general.checkout')</h6>
<ul>
<li>This asset is not checked out to anyone yet. Use the button below to check it out now.</li>
Expand Down