ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:snipe/snipe-it into develop

Browse Source
This commit is contained in:
Gil Rutkowski
2013-11-29 15:45:41 -06:00
parent 7c3a9faf53 7142e37372
commit 2e82794ab4
5 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/LicenseSeat.php
+1 -1
View File
@@ -11,7 +11,7 @@ class LicenseSeat extends Elegant {
public function user()
{
return $this->belongsTo('User','assigned_to');
return $this->belongsTo('User','assigned_to')->withTrashed();
}
}
app/views/backend/licenses/index.blade.php
+3 -1
View File
@@ -62,10 +62,12 @@ Licenses ::
</td>
<td><a href="{{ route('view/license', $license->id) }}">{{ $license->serial }}</a></td>
<td>
@if ($licensedto->assigned_to)
@if (($licensedto->assigned_to) && ($licensedto->deleted_at == NULL))
<a href="{{ route('view/user', $licensedto->assigned_to) }}">
{{ $licensedto->user->fullName() }}
</a>
@elseif (($licensedto->assigned_to) && ($licensedto->deleted_at != NULL))
<del>{{ $licensedto->user->fullName() }}</del>
@endif
</td>
<td>
app/views/backend/licenses/view.blade.php
+27 -30
View File
@@ -8,35 +8,35 @@ View License {{ $license->name }} ::
{{-- Page content --}}
@section('content')
<div id="pad-wrapper" class="user-profile">
<!-- header -->
<h3 class="name">History for ({{ $license->name }})
<div class="row header">
<div class="col-md-12">
<div class="btn-group pull-right">
<button class="btn glow">Actions</button>
<button class="btn glow dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
@if ($license->assigned_to != 0)
<li><a href="{{ route('checkin/license', $license->id) }}" class="btn-flat info">Checkin</a></li>
@else
<li><a href="{{ route('checkout/license', $license->id) }}" class="btn-flat success">Checkout</a></li>
@endif
<li><a href="{{ route('update/license', $license->id) }}">Edit License</a></li>
</ul>
</div>
<h3 class="name">History for ({{ $license->name }})</h3>
</div>
</div>
<div class="user-profile">
<div class="row profile">
<div class="col-md-9 bio">
<div class="btn-group pull-right">
<button class="btn glow">Actions</button>
<button class="btn glow dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
@if ($license->assigned_to != 0)
<li><a href="{{ route('checkin/license', $license->id) }}" class="btn-flat info">Checkin</a></li>
@else
<li><a href="{{ route('checkout/license', $license->id) }}" class="btn-flat success">Checkout</a></li>
@endif
<li><a href="{{ route('update/license', $license->id) }}">Edit License</a></li>
</ul>
</div>
</h3>
<div class="row-fluid profile">
<!-- bio, new note & orders column -->
<div class="col-md-9 bio">
<div class="profile-box">
<br>
<!-- checked out assets table -->
<h6>{{ $license->seats }} License Seats</h6>
<table class="table table-hover">
<thead>
@@ -141,13 +141,10 @@ View License {{ $license->name }} ::
</tbody>
</table>
</div>
</div>
<!-- side address column -->
<div class="col-md-3 address pull-right">
<div class="col-md-3 col-xs-12 address pull-right">
<h6><br>License Info:</h6>
<ul>
@if ($license->serial)
app/views/backend/users/index.blade.php
+2 -2
View File
@@ -58,7 +58,7 @@ User Management ::
<td>{{ $user->licenses->count() }}</td>
<td>{{ $user->isActivated() ? '<i class="icon-ok"></i>' : ''}}</td>
<td>
@if ($user->id > 3)
@if ($user->id > 2)
@if ( ! is_null($user->deleted_at))
<a href="{{ route('restore/user', $user->id) }}" class="btn btn-warning"><i class="icon-share-alt icon-white"></i></a>
@else
@@ -67,7 +67,7 @@ User Management ::
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/user', $user->id) }}" data-content="Are you sure you wish to delete this user?" data-title="Delete {{ htmlspecialchars($user->first_name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
@else
<span class="btn-flat danger disabled"><i class="icon-remove icon-white"></i> @lang('button.delete')</span>
<span class="btn-flat danger disabled"><i class="icon-trash icon-white"></i></span>
@endif
@endif
@endif
app/views/backend/users/view.blade.php
+15 -13
View File
@@ -8,19 +8,20 @@ View User {{ $user->fullName() }} ::
{{-- Page content --}}
@section('content')
<div id="pad-wrapper" class="user-profile">
<!-- header -->
<div class="row-fluid header">
<div class="col-md-8">
<img src="{{ $user->gravatar() }}" class="avatar img-circle">
<h3 class="name">{{ $user->fullName() }}</h3>
<span class="area">{{ $user->jobtitle }}</span>
</div>
<a href="{{ route('update/user', $user->id) }}" class="btn-flat white large pull-right edit"><i class="icon-pencil"></i> @lang('button.edit') This User</a>
<div class="user-profile">
<!-- header -->
<div class="row header">
<div class="col-md-8">
<img src="{{ $user->gravatar() }}" class="avatar img-circle">
<h3 class="name">{{ $user->fullName() }}</h3>
<span class="area">{{ $user->jobtitle }}</span>
</div>
<a href="{{ route('update/user', $user->id) }}" class="btn-flat white large pull-right edit"><i class="icon-pencil"></i> @lang('button.edit') This User</a>
</div>
<div class="row profile">
<div class="row-fluid profile">
<!-- bio, new note & orders column -->
<div class="col-md-9 bio">
<div class="profile-box">
@@ -59,7 +60,7 @@ View User {{ $user->fullName() }} ::
</table>
@else
<div class="col-md-6">
<div class="col-md-12">
<div class="alert alert-warning alert-block">
<i class="icon-warning-sign"></i>
@lang('admin/users/table.noresults')
@@ -100,7 +101,7 @@ View User {{ $user->fullName() }} ::
</table>
@else
<div class="col-md-6">
<div class="col-md-12">
<div class="alert alert-warning alert-block">
<i class="icon-warning-sign"></i>
@lang('admin/users/table.noresults')
@@ -144,7 +145,8 @@ View User {{ $user->fullName() }} ::
</table>
@else
<div class="col-md-6">
<div class="col-md-12">
<div class="alert alert-warning alert-block">
<i class="icon-warning-sign"></i>
@lang('admin/users/table.noresults')