Skip to content

Commit 28abeab

Browse files
snipesnipe
committed
Fixed a few more display_name instances
Signed-off-by: snipe <snipe@snipe.net>
1 parent 12a649e commit 28abeab

22 files changed

+51
-52
lines changed

‎app/Console/Commands/Purge.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public function handle()
6565
$maintenances = 0;
6666

6767
foreach ($assets as $asset) {
68-
$this->info('- Asset "'.$asset->present()->name().'" deleted.');
68+
$this->info('- Asset "'.$asset->display_name.'" deleted.');
6969
$asset_assoc += $asset->assetlog()->count();
7070
$asset->assetlog()->forceDelete();
7171
$maintenances += $asset->maintenances()->count();

‎app/Http/Transformers/ComponentsTransformer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function transformCheckedoutComponents(Collection $components_assets, $to
7676
$array[] = [
7777
'assigned_pivot_id' => $asset->pivot->id,
7878
'id' => (int) $asset->id,
79-
'name' => e($asset->model->present()->name).' '.e($asset->present()->name),
79+
'name' => e($asset->model->display_name).' '.e($asset->display_name),
8080
'qty' => $asset->pivot->assigned_qty,
8181
'note' => $asset->pivot->note,
8282
'type' => 'asset',

‎app/Http/Transformers/ProfileTransformer.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use App\Helpers\Helper;
66
use App\Models\Actionlog;
7-
use App\Models\Asset;
87
use Illuminate\Database\Eloquent\Collection;
98

109
class ProfileTransformer

‎app/Notifications/AuditNotification.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static function toMicrosoftTeams($params)
9393
}
9494
$message = class_basename(get_class($params['item'])) . ' Audited By '.$admin_user->display_name;
9595
$details = [
96-
trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
96+
trans('mail.asset') => htmlspecialchars_decode($item->display_name),
9797
trans('mail.notes') => $note ?: '',
9898
trans('general.location') => $location ?: '',
9999
];

‎app/Notifications/CheckinAccessoryNotification.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function toSlack()
9090
->from($botname)
9191
->to($channel)
9292
->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
93-
$attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
93+
$attachment->title(htmlspecialchars_decode($item->display_name), $item->present()->viewUrl())
9494
->fields($fields)
9595
->content($note);
9696
});
@@ -107,7 +107,7 @@ public function toMicrosoftTeams()
107107
->addStartGroupToSection('activityTitle')
108108
->title(trans('Accessory_Checkin_Notification'))
109109
->addStartGroupToSection('activityText')
110-
->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
110+
->fact(htmlspecialchars_decode($item->display_name), '', 'activityTitle')
111111
->fact(trans('mail.checked_into'), $item->location->name ? $item->location->name : '')
112112
->fact(trans('mail.Accessory_Checkin_Notification')." by ", $admin->display_name)
113113
->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
@@ -116,7 +116,7 @@ public function toMicrosoftTeams()
116116

117117
$message = trans('mail.Accessory_Checkin_Notification');
118118
$details = [
119-
trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
119+
trans('mail.accessory_name') => htmlspecialchars_decode($item->display_name),
120120
trans('mail.checked_into') => $item->location->name ? $item->location->name : '',
121121
trans('mail.Accessory_Checkin_Notification'). ' by' => $admin->display_name,
122122
trans('admin/consumables/general.remaining')=> $item->numRemaining(),
@@ -135,7 +135,7 @@ public function toGoogleChat()
135135
Card::create()
136136
->header(
137137
'<strong>'.trans('mail.Accessory_Checkin_Notification').'</strong>' ?: '',
138-
htmlspecialchars_decode($item->present()->name) ?: '',
138+
htmlspecialchars_decode($item->display_name) ?: '',
139139
)
140140
->section(
141141
Section::create(

‎app/Notifications/CheckinAssetNotification.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function toSlack()
9797
->from($botname)
9898
->to($channel)
9999
->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
100-
$attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
100+
$attachment->title(htmlspecialchars_decode($item->display_name), $item->present()->viewUrl())
101101
->fields($fields)
102102
->content($note);
103103
});
@@ -114,7 +114,7 @@ public function toMicrosoftTeams()
114114
->type('success')
115115
->title(trans('mail.Asset_Checkin_Notification'))
116116
->addStartGroupToSection('activityText')
117-
->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
117+
->fact(htmlspecialchars_decode($item->display_name), '', 'activityText')
118118
->fact(trans('mail.checked_into'), ($item->location) ? $item->location->name : '')
119119
->fact(trans('mail.Asset_Checkin_Notification') . " by ", $admin->display_name)
120120
->fact(trans('admin/hardware/form.status'), $item->assetstatus?->name)
@@ -124,7 +124,7 @@ public function toMicrosoftTeams()
124124

125125
$message = trans('mail.Asset_Checkin_Notification');
126126
$details = [
127-
trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
127+
trans('mail.asset') => htmlspecialchars_decode($item->display_name),
128128
trans('mail.checked_into') => ($item->location) ? $item->location->name : '',
129129
trans('mail.Asset_Checkin_Notification')." by " => $admin->display_name,
130130
trans('admin/hardware/form.status') => $item->assetstatus?->name,
@@ -145,7 +145,7 @@ public function toGoogleChat()
145145
Card::create()
146146
->header(
147147
'<strong>'.trans('mail.Asset_Checkin_Notification').'</strong>' ?: '',
148-
htmlspecialchars_decode($item->present()->name) ?: '',
148+
htmlspecialchars_decode($item->display_name) ?: '',
149149
)
150150
->section(
151151
Section::create(

‎app/Notifications/CheckinComponentNotification.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public function toSlack()
100100
->from($botname)
101101
->to($channel)
102102
->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
103-
$attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
103+
$attachment->title(htmlspecialchars_decode($item->display_name), $item->present()->viewUrl())
104104
->fields($fields)
105105
->content($note);
106106
});
@@ -118,7 +118,7 @@ public function toMicrosoftTeams()
118118
->addStartGroupToSection('activityTitle')
119119
->title(trans('mail.Component_checkin_notification'))
120120
->addStartGroupToSection('activityText')
121-
->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
121+
->fact(htmlspecialchars_decode($item->display_name), '', 'header')
122122
->fact(trans('mail.Component_checkin_notification')." by ", $admin->display_name ?: 'CLI tool')
123123
->fact(trans('mail.checkedin_from'), $target->display_name)
124124
->fact(trans('admin/consumables/general.remaining'), $item->numRemaining())
@@ -147,7 +147,7 @@ public function toGoogleChat()
147147
Card::create()
148148
->header(
149149
'<strong>'.trans('mail.Component_checkin_notification').'</strong>' ?: '',
150-
htmlspecialchars_decode($item->present()->name) ?: '',
150+
htmlspecialchars_decode($item->display_name) ?: '',
151151
)
152152
->section(
153153
Section::create(

‎app/Notifications/CheckinLicenseSeatNotification.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public function toSlack()
101101
->from($botname)
102102
->to($channel)
103103
->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
104-
$attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
104+
$attachment->title(htmlspecialchars_decode($item->display_name), $item->present()->viewUrl())
105105
->fields($fields)
106106
->content($note);
107107
});
@@ -119,7 +119,7 @@ public function toMicrosoftTeams()
119119
->addStartGroupToSection('activityTitle')
120120
->title(trans('mail.License_Checkin_Notification'))
121121
->addStartGroupToSection('activityText')
122-
->fact(htmlspecialchars_decode($item->present()->name), '', 'header')
122+
->fact(htmlspecialchars_decode($item->display_name), '', 'header')
123123
->fact(trans('mail.License_Checkin_Notification')." by ", $admin->display_name ?: 'CLI tool')
124124
->fact(trans('mail.checkedin_from'), $target->display_name)
125125
->fact(trans('admin/consumables/general.remaining'), $item->availCount()->count())
@@ -129,7 +129,7 @@ public function toMicrosoftTeams()
129129
$message = trans('mail.License_Checkin_Notification');
130130
$details = [
131131
trans('mail.checkedin_from')=> $target->display_name,
132-
trans('mail.license_for') => htmlspecialchars_decode($item->present()->name),
132+
trans('mail.license_for') => htmlspecialchars_decode($item->display_name),
133133
trans('mail.License_Checkin_Notification')." by " => $admin->display_name ?: 'CLI tool',
134134
trans('admin/consumables/general.remaining') => $item->availCount()->count(),
135135
trans('mail.notes') => $note ?: '',
@@ -149,7 +149,7 @@ public function toGoogleChat()
149149
Card::create()
150150
->header(
151151
'<strong>'.trans('mail.License_Checkin_Notification').'</strong>' ?: '',
152-
htmlspecialchars_decode($item->present()->name) ?: '',
152+
htmlspecialchars_decode($item->display_name) ?: '',
153153
)
154154
->section(
155155
Section::create(

‎app/Notifications/CheckoutAccessoryNotification.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function toSlack()
117117
->from($botname)
118118
->to($channel)
119119
->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
120-
$attachment->title(htmlspecialchars_decode($this->checkout_qty.' x '.$item->present()->name), $item->present()->viewUrl())
120+
$attachment->title(htmlspecialchars_decode($this->checkout_qty.' x '.$item->display_name), $item->present()->viewUrl())
121121
->fields($fields)
122122
->content($note);
123123
});
@@ -136,8 +136,8 @@ public function toMicrosoftTeams()
136136
->addStartGroupToSection('activityTitle')
137137
->title(trans('mail.Accessory_Checkout_Notification'))
138138
->addStartGroupToSection('activityText')
139-
->fact(htmlspecialchars_decode($item->present()->name), '', 'activityTitle')
140-
->fact(trans('mail.assigned_to'), $target->present()->name)
139+
->fact(htmlspecialchars_decode($item->display_name), '', 'activityTitle')
140+
->fact(trans('mail.assigned_to'), $target->display_name)
141141
->fact(trans('general.qty'), $this->checkout_qty)
142142
->fact(trans('mail.checkedout_from'), $item->location->name ? $item->location->name : '')
143143
->fact(trans('mail.Accessory_Checkout_Notification') . " by ", $admin->display_name)
@@ -148,7 +148,7 @@ public function toMicrosoftTeams()
148148
$message = trans('mail.Accessory_Checkout_Notification');
149149
$details = [
150150
trans('mail.assigned_to') => $target->present()->name,
151-
trans('mail.accessory_name') => htmlspecialchars_decode($item->present()->name),
151+
trans('mail.accessory_name') => htmlspecialchars_decode($item->display_name),
152152
trans('general.qty') => $this->checkout_qty,
153153
trans('mail.checkedout_from') => $item->location->name ? $item->location->name : '',
154154
trans('mail.Accessory_Checkout_Notification'). ' by' => $admin->display_name,
@@ -169,7 +169,7 @@ public function toGoogleChat()
169169
Card::create()
170170
->header(
171171
'<strong>'.trans('mail.Accessory_Checkout_Notification').'</strong>' ?: '',
172-
htmlspecialchars_decode($item->present()->name) ?: '',
172+
htmlspecialchars_decode($item->display_name) ?: '',
173173
)
174174
->section(
175175
Section::create(

‎app/Notifications/CheckoutAssetNotification.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public function toSlack() :SlackMessage
114114
->from($botname)
115115
->to($channel)
116116
->attachment(function ($attachment) use ($item, $note, $admin, $fields) {
117-
$attachment->title(htmlspecialchars_decode($item->present()->name), $item->present()->viewUrl())
117+
$attachment->title(htmlspecialchars_decode($item->display_name), $item->present()->viewUrl())
118118
->fields($fields)
119119
->content($note);
120120
});
@@ -133,16 +133,16 @@ public function toMicrosoftTeams()
133133
->type('success')
134134
->title(trans('mail.Asset_Checkout_Notification'))
135135
->addStartGroupToSection('activityText')
136-
->fact(trans('mail.assigned_to'), $target->present()->name)
137-
->fact(htmlspecialchars_decode($item->present()->name), '', 'activityText')
136+
->fact(trans('mail.assigned_to'), $target->display_name)
137+
->fact(htmlspecialchars_decode($item->display_name), '', 'activityText')
138138
->fact(trans('mail.Asset_Checkout_Notification') . " by ", $admin->display_name)
139139
->fact(trans('mail.notes'), $note ?: '');
140140
}
141141

142142
$message = trans('mail.Asset_Checkout_Notification');
143143
$details = [
144144
trans('mail.assigned_to') => $target->present()->name,
145-
trans('mail.asset') => htmlspecialchars_decode($item->present()->name),
145+
trans('mail.asset') => htmlspecialchars_decode($item->display_name),
146146
trans('mail.Asset_Checkout_Notification'). ' by' => $admin->display_name,
147147
trans('mail.notes') => $note ?: '',
148148
];
@@ -160,7 +160,7 @@ public function toGoogleChat()
160160
Card::create()
161161
->header(
162162
'<strong>'.trans('mail.Asset_Checkout_Notification').'</strong>' ?: '',
163-
htmlspecialchars_decode($item->present()->name) ?: '',
163+
htmlspecialchars_decode($item->display_name) ?: '',
164164
)
165165
->section(
166166
Section::create(

0 commit comments

Comments
 (0)