Skip to content

Commit

Permalink
Merge pull request #115 from devaslanphp/dev
Browse files Browse the repository at this point in the history 
Bug-fix: Kanban / disable update slug on update modal
  • Loading branch information
@heloufir
heloufir authored Sep 27, 2022
2 parents 1eba9da + 773e238 commit cdc4242
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 21 deletions.
1 change: 0 additions & 1 deletion app/Http/Livewire/Administration/TicketPrioritiesDialog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ public function save(): void
$this->priority->text_color = $data['text_color'];
$this->priority->bg_color = $data['bg_color'];
$this->priority->icon = $data['icon'];
$this->priority->slug = Str::slug($data['title'], '_');
$this->priority->save();
Notification::make()
->success()
Expand Down
1 change: 0 additions & 1 deletion app/Http/Livewire/Administration/TicketStatusesDialog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ public function save(): void
$this->status->text_color = $data['text_color'];
$this->status->bg_color = $data['bg_color'];
$this->status->default = $data['default'];
$this->status->slug = Str::slug($data['title'], '_');
$this->status->save();
Notification::make()
->success()
Expand Down
1 change: 0 additions & 1 deletion app/Http/Livewire/Administration/TicketTypesDialog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ public function save(): void
$this->type->text_color = $data['text_color'];
$this->type->bg_color = $data['bg_color'];
$this->type->icon = $data['icon'];
$this->type->slug = Str::slug($data['title'], '_');
$this->type->save();
Notification::make()
->success()
Expand Down
36 changes: 20 additions & 16 deletions app/Http/Livewire/Kanban.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,25 @@ protected function records(): Collection
'title' => new HtmlString('
<div class="w-full flex flex-col space-y-3">
<div class="w-full flex items-center gap-2">
<div title="' . $type['title'] . '"
class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center"
style="color: ' . $type->text_color . '; background-color: ' . $type->bg_color . ';"
>
<i class="fa ' . $type['icon'] . '"></i>
</div>
<div title="' . $priority['title'] . '"
class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center"
style="
color: ' . $priority->text_color . ';
background-color: ' . $priority->bg_color . ';
"
>
<i class="fa ' . $priority['icon'] . '"></i>
</div>
' . ($type ? '
<div title="' . $type['title'] . '"
class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center"
style="color: ' . $type->text_color . '; background-color: ' . $type->bg_color . ';"
>
<i class="fa ' . $type['icon'] . '"></i>
</div>
' : '') . '
' . ($priority ? '
<div title="' . $priority['title'] . '"
class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center"
style="
color: ' . $priority->text_color . ';
background-color: ' . $priority->bg_color . ';
"
>
<i class="fa ' . $priority['icon'] . '"></i>
</div>
' : '') . '
<span class="text-sm font-normal"
title="' . $ticket->title . '">
' . Str::limit($ticket->title, 15) . '
Expand All @@ -79,7 +83,7 @@ class="text-xs rounded-full w-6 h-6 flex items-center justify-center text-center
<div class="w-full flex items-center space-x-4">
<div class="flex items-center gap-1">
' .
($ticket->responsible ? '
($ticket->responsible ? '
<img src="' . $ticket->responsible->avatar_url . '"
alt="' . $ticket->responsible->name . '"
class="rounded-full shadow"
Expand Down
9 changes: 7 additions & 2 deletions public/docs/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<!-- Logo -->
<a class="logo ml-md-3" href="index.html" title="Help Desk">
<img src="/docs/assets/images/logo.png" alt="Help Desk" width="120" /> </a>
<span class="text-2 ml-2">v1.4.3</span>
<span class="text-2 ml-2">v1.4.4</span>
<!-- Logo End -->

<!-- Navbar Toggler -->
Expand Down Expand Up @@ -91,6 +91,7 @@
<li class="nav-item"><a class="nav-link" href="#idocs_faq">FAQ</a></li>
<li class="nav-item"><a class="nav-link" href="#idocs_changelog">Changelog</a>
<ul class="nav flex-column">
<li class="nav-item"><a class="nav-link" href="#v1-4-4">v1.4.4</a></li>
<li class="nav-item"><a class="nav-link" href="#v1-4-3">v1.4.3</a></li>
<li class="nav-item"><a class="nav-link" href="#v1-4-2">v1.4.2</a></li>
<li class="nav-item"><a class="nav-link" href="#v1-4-1">v1.4.1</a></li>
Expand Down Expand Up @@ -132,7 +133,7 @@ <h2>Help Desk</h2>
<div class="row">
<div class="col-sm-6 col-lg-4">
<ul class="list-unstyled">
<li><strong>Version:</strong> 1.4.3</li>
<li><strong>Version:</strong> 1.4.4</li>
<li><strong>Author:</strong> <a href="mailto:[email protected]"
target="_blank">heloufir</a>
</li>
Expand Down Expand Up @@ -331,6 +332,10 @@ <h5 class="mb-0"> <a href="#" class="collapsed" data-toggle="collapse" data-targ
<section id="idocs_changelog">
<h2>Changelog</h2>
<p class="text-4">See what's new added, changed, fixed, improved or updated in the latest versions. </p>
<h3 id="v1-4-4">Version 1.4.4 <small class="text-muted">(27 September, 2022)</small></h3>
<ul>
<li>Bug-fix: Kanban / disable update slug on update modal</li>
</ul>
<h3 id="v1-4-3">Version 1.4.3 <small class="text-muted">(27 September, 2022)</small></h3>
<ul>
<li>Administration design enhancement</li>
Expand Down

0 comments on commit cdc4242

Please sign in to comment.