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

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

Browse source
This commit is contained in:
snipe 2016-07-28 21:31:58 -07:00
parent 47f6635992 eef8d1609e
commit 85232c47da
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -626,12 +626,12 @@ class AssetsController extends Controller
if ($asset->save()) {
if ($request->input('checkin_at') == Carbon::now()->format('Y-m-d')) {
$checkout_at = Carbon::now();
$checkin_at = Carbon::now();
} else {
$checkout_at = $request->input('checkin_at').' 00:00:00';
$checkin_at = $request->input('checkin_at').' 00:00:00';
}
//$checkout_at = e(Input::get('checkin_at'));
$logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkout_at);
//$checkin_at = e(Input::get('checkin_at'));
$logaction = $asset->createLogRecord('checkin', $asset, $admin, $user, null, e(Input::get('note')), $checkin_at);
$settings = Setting::getSettings();

2
app/Models/User.php
View file

@ -55,7 +55,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
$user_permissions = json_decode($this->permissions, true);
//If the user is explicitly granted, return false
//If the user is explicitly granted, return true
if (($user_permissions!='') && ((array_key_exists($section, $user_permissions)) && ($user_permissions[$section]=='1'))) {
return true;
}

2
app/Providers/AuthServiceProvider.php
View file

@ -205,7 +205,7 @@ class AuthServiceProvider extends ServiceProvider
# Components
# -----------------------------------------
$gate->define('components.view', function ($user) {
if (($user->hasAccess('components.create')) || ($user->hasAccess('admin'))) {
if (($user->hasAccess('components.view')) || ($user->hasAccess('admin'))) {
return true;
}
});

4
resources/views/licenses/view.blade.php
View file

@ -148,14 +148,14 @@
@if (!is_null($license->license_name))
<tr>
<td>{{ trans('admin/licenses/form.to_name') }}</td>
<td>{{ nl2br(e($license->license_name)) }}</td>
<td>{{ $license->license_name }}</td>
</tr>
@endif
@if (!is_null($license->license_email))
<tr>
<td>{{ trans('admin/licenses/form.to_email') }}</td>
<td>{{ nl2br(e($license->license_email)) }}</td>
<td>{{ $license->license_email }}</td>
</tr>
@endif