Skip to content

Commit cdc4242

Browse files
heloufirheloufir
authored
Merge pull request #115 from devaslanphp/dev
Bug-fix: Kanban / disable update slug on update modal
2 parents 1eba9da + 773e238 commit cdc4242

5 files changed

Lines changed: 27 additions & 21 deletions

File tree

‎app/Http/Livewire/Administration/TicketPrioritiesDialog.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@ public function save(): void
136136
$this->priority->text_color = $data['text_color'];
137137
$this->priority->bg_color = $data['bg_color'];
138138
$this->priority->icon = $data['icon'];
139-
$this->priority->slug = Str::slug($data['title'], '_');
140139
$this->priority->save();
141140
Notification::make()
142141
->success()

‎app/Http/Livewire/Administration/TicketStatusesDialog.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ public function save(): void
104104
$this->status->text_color = $data['text_color'];
105105
$this->status->bg_color = $data['bg_color'];
106106
$this->status->default = $data['default'];
107-
$this->status->slug = Str::slug($data['title'], '_');
108107
$this->status->save();
109108
Notification::make()
110109
->success()

‎app/Http/Livewire/Administration/TicketTypesDialog.php‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ public function save(): void
125125
$this->type->text_color = $data['text_color'];
126126
$this->type->bg_color = $data['bg_color'];
127127
$this->type->icon = $data['icon'];
128-
$this->type->slug = Str::slug($data['title'], '_');
129128
$this->type->save();
130129
Notification::make()
131130
->success()

‎app/Http/Livewire/Kanban.php‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,25 @@ protected function records(): Collection
5353
'title' => new HtmlString('
5454
<div class="w-full flex flex-col space-y-3">
5555
<div class="w-full flex items-center gap-2">
56-
<div title="' . $type['title'] . '"
57-
class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center"
58-
style="color: ' . $type->text_color . '; background-color: ' . $type->bg_color . ';"
59-
>
60-
<i class="fa ' . $type['icon'] . '"></i>
61-
</div>
62-
<div title="' . $priority['title'] . '"
63-
class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center"
64-
style="
65-
color: ' . $priority->text_color . ';
66-
background-color: ' . $priority->bg_color . ';
67-
"
68-
>
69-
<i class="fa ' . $priority['icon'] . '"></i>
70-
</div>
56+
' . ($type ? '
57+
<div title="' . $type['title'] . '"
58+
class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center"
59+
style="color: ' . $type->text_color . '; background-color: ' . $type->bg_color . ';"
60+
>
61+
<i class="fa ' . $type['icon'] . '"></i>
62+
</div>
63+
' : '') . '
64+
' . ($priority ? '
65+
<div title="' . $priority['title'] . '"
66+
class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center"
67+
style="
68+
color: ' . $priority->text_color . ';
69+
background-color: ' . $priority->bg_color . ';
70+
"
71+
>
72+
<i class="fa ' . $priority['icon'] . '"></i>
73+
</div>
74+
' : '') . '
7175
<span class="text-sm font-normal"
7276
title="' . $ticket->title . '">
7377
' . Str::limit($ticket->title, 15) . '
@@ -79,7 +83,7 @@ class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center
7983
<div class="w-full flex items-center space-x-4">
8084
<div class="flex items-center gap-1">
8185
' .
82-
($ticket->responsible ? '
86+
($ticket->responsible ? '
8387
<img src="' . $ticket->responsible->avatar_url . '"
8488
alt="' . $ticket->responsible->name . '"
8589
class="rounded-full shadow"

‎public/docs/index.html‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<!-- Logo -->
5555
<a class="logo ml-md-3" href="index.html" title="Help Desk">
5656
<img src="/docs/assets/images/logo.png" alt="Help Desk" width="120" /> </a>
57-
<span class="text-2 ml-2">v1.4.3</span>
57+
<span class="text-2 ml-2">v1.4.4</span>
5858
<!-- Logo End -->
5959

6060
<!-- Navbar Toggler -->
@@ -91,6 +91,7 @@
9191
<li class="nav-item"><a class="nav-link" href="#idocs_faq">FAQ</a></li>
9292
<li class="nav-item"><a class="nav-link" href="#idocs_changelog">Changelog</a>
9393
<ul class="nav flex-column">
94+
<li class="nav-item"><a class="nav-link" href="#v1-4-4">v1.4.4</a></li>
9495
<li class="nav-item"><a class="nav-link" href="#v1-4-3">v1.4.3</a></li>
9596
<li class="nav-item"><a class="nav-link" href="#v1-4-2">v1.4.2</a></li>
9697
<li class="nav-item"><a class="nav-link" href="#v1-4-1">v1.4.1</a></li>
@@ -132,7 +133,7 @@ <h2>Help Desk</h2>
132133
<div class="row">
133134
<div class="col-sm-6 col-lg-4">
134135
<ul class="list-unstyled">
135-
<li><strong>Version:</strong> 1.4.3</li>
136+
<li><strong>Version:</strong> 1.4.4</li>
136137
<li><strong>Author:</strong> <a href="mailto:eloufirhatim@gmail.com"
137138
target="_blank">heloufir</a>
138139
</li>
@@ -331,6 +332,10 @@ <h5 class="mb-0"> <a href="#" class="collapsed" data-toggle="collapse" data-targ
331332
<section id="idocs_changelog">
332333
<h2>Changelog</h2>
333334
<p class="text-4">See what's new added, changed, fixed, improved or updated in the latest versions. </p>
335+
<h3 id="v1-4-4">Version 1.4.4 <small class="text-muted">(27 September, 2022)</small></h3>
336+
<ul>
337+
<li>Bug-fix: Kanban / disable update slug on update modal</li>
338+
</ul>
334339
<h3 id="v1-4-3">Version 1.4.3 <small class="text-muted">(27 September, 2022)</small></h3>
335340
<ul>
336341
<li>Administration design enhancement</li>

0 commit comments

Comments
 (0)