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

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2017-09-29 02:08:06 -07:00
parent 3d57d1bd1d faf3802971
commit db59d4b2c4
4 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/LicensesController.php
View file

@ -279,7 +279,7 @@ class LicensesController extends Controller
// Declare the rules for the form validation // Declare the rules for the form validation
$rules = [ $rules = [
'note' => 'string', 'note' => 'string|nullable',
'asset_id' => 'required_without:assigned_to', 'asset_id' => 'required_without:assigned_to',
]; ];

15
app/Notifications/CheckoutNotification.php
View file

@ -44,7 +44,9 @@ class CheckoutNotification extends Notification
} }
$item = $this->params['item']; $item = $this->params['item'];
$notifyBy[]='mail'; if (class_basename(get_class($this->params['item']))!='License') {
$notifyBy[] = 'mail';
}
// if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance()=='1')) // if ((method_exists($item, 'requireAcceptance') && ($item->requireAcceptance()=='1'))
// || (method_exists($item, 'getEula') && ($item->getEula())) // || (method_exists($item, 'getEula') && ($item->getEula()))
// ) { // ) {
@ -81,6 +83,7 @@ class CheckoutNotification extends Notification
*/ */
public function toMail($notifiable) public function toMail($notifiable)
{ {
//TODO: Expand for non assets. //TODO: Expand for non assets.
$item = $this->params['item']; $item = $this->params['item'];
$admin_user = $this->params['admin']; $admin_user = $this->params['admin'];
@ -97,14 +100,14 @@ class CheckoutNotification extends Notification
'require_acceptance' => method_exists($item, 'requireAcceptance') ? $item->requireAcceptance() : '', 'require_acceptance' => method_exists($item, 'requireAcceptance') ? $item->requireAcceptance() : '',
'log_id' => $this->params['log_id'], 'log_id' => $this->params['log_id'],
]; ];
return (new MailMessage) return (new MailMessage)
->view('emails.accept-asset', $data) ->view('emails.accept-asset', $data)
->subject(trans('mail.Confirm_asset_delivery')); ->subject(trans('mail.Confirm_asset_delivery'));
// \Mail::send('emails.accept-asset', $data, function ($m) use ($target) {
// $m->to($target->email, $target->first_name . ' ' . $target->last_name);
// $m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
// $m->subject(trans('mail.Confirm_asset_delivery'));
// });
} }
/** /**

2
resources/views/users/view.blade.php
View file

@ -426,7 +426,7 @@
</td> </td>
<td> <td>
@can('update', $user) @can('update', $user)
<a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('delete/userfile', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?"><i class="fa fa-trash icon-white"></i></a> <a class="btn delete-asset btn-danger btn-sm hidden-print" href="{{ route('userfile.destroy', [$user->id, $file->id]) }}" data-content="Are you sure you wish to delete this file?" data-title="Delete {{ $file->filename }}?"><i class="fa fa-trash icon-white"></i></a>
@endcan @endcan
</td> </td>
</tr> </tr>

4
routes/web/users.php
View file

@ -13,9 +13,9 @@ Route::group([ 'prefix' => 'users', 'middleware' => ['auth']], function () {
Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore' ]); Route::get('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'UsersController@getRestore' ]);
Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend' ]); Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'UsersController@getUnsuspend' ]);
Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'UsersController@postUpload' ]); Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'UsersController@postUpload' ]);
Route::get( Route::delete(
'{userId}/deletefile/{fileId}', '{userId}/deletefile/{fileId}',
[ 'as' => 'delete/userfile', 'uses' => 'UsersController@getDeleteFile' ] [ 'as' => 'userfile.destroy', 'uses' => 'UsersController@getDeleteFile' ]
); );
Route::get( Route::get(
'{userId}/showfile/{fileId}', '{userId}/showfile/{fileId}',