DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-31 07:30:46 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2024-11-19 13:32:02 +00:00
parent 53cfcb7143 d576016a1c
commit 4384f8dcbb
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/Users/BulkUsersController.php
View file

@ -323,7 +323,7 @@ class BulkUsersController extends Controller
$logAction->item_type = $itemType; $logAction->item_type = $itemType;
$logAction->target_id = $item->assigned_to; $logAction->target_id = $item->assigned_to;
$logAction->target_type = User::class; $logAction->target_type = User::class;
$logAction->created_at = auth()->id(); $logAction->created_by = auth()->id();
$logAction->note = 'Bulk checkin items'; $logAction->note = 'Bulk checkin items';
$logAction->logaction('checkin from'); $logAction->logaction('checkin from');
} }

2
database/migrations/2023_08_01_174150_change_webhook_settings_variable_type.php
View file

@ -26,7 +26,7 @@ class ChangeWebhookSettingsVariableType extends Migration
public function down() public function down()
{ {
Schema::table('settings', function (Blueprint $table) { Schema::table('settings', function (Blueprint $table) {
$table->varchar('webhook_endpoint')->change(); $table->string('webhook_endpoint')->change();
}); });
} }

2
database/migrations/2024_09_17_204302_change_user_id_to_created_by.php
View file

@ -42,7 +42,7 @@ return new class extends Migration
} }
foreach ($this->existing_table_list() as $table) { foreach ($this->existing_table_list() as $table) {
if (Schema::hasColumn($table, 'user_id')) { if (Schema::hasColumn($table, 'created_by')) {
Schema::table($table, function (Blueprint $table) { Schema::table($table, function (Blueprint $table) {
$table->renameColumn('created_by', 'user_id'); $table->renameColumn('created_by', 'user_id');
}); });

10
resources/views/hardware/bulk-delete.blade.php
View file

@ -43,14 +43,14 @@
<td>{{ $asset->present()->name() }}</td> <td>{{ $asset->present()->name() }}</td>
<td> <td>
@if ($asset->location) @if ($asset->location)
{{ $asset->location->name }} {{ $asset->location->present()->name() }}
@elseif($asset->rtd_location)
{{ $asset->defaultLoc->present()->name() }}
@endif @endif
</td> </td>
<td> <td>
@if ($asset->assigned_to)
{{ $asset->assigned_to }} {{ $asset->assigned->present()->name() }}
@if ($asset->assignedTo)
{{ $asset->assignedTo->present()->name()}}
@endif @endif
</td> </td>
</tr> </tr>