Skip to content

Commit 0954b43

Browse files
committed
Merge branch 'unread' into dev
2 parents 3984c7c + 118faa3 commit 0954b43

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

src/Controllers/TicketsController.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,7 @@ public function register_search_fields(Request $request)
10691069
$search_URL = route(Setting::grab('main_route') . '.search');
10701070

10711071
// Check all fields
1072-
$a_fields = array_merge($this->a_search_fields_numeric, $this->a_search_fields_text, $this->a_search_fields_date, $this->a_search_fields_text_special, ['department_id', 'list']);
1072+
$a_fields = array_merge($this->a_search_fields_numeric, ['tags_type'], $this->a_search_fields_text, $this->a_search_fields_date, $this->a_search_fields_text_special, ['department_id', 'list']);
10731073
foreach ($a_fields as $field){
10741074
if($request->filled($field)){
10751075
// Add field to search
@@ -1102,7 +1102,12 @@ public function register_search_fields(Request $request)
11021102
}
11031103

11041104
$search_URL.= '/' . $field . '_type/' . $search_fields[$field . '_type'];
1105-
}
1105+
}
1106+
1107+
// Register tags_type although "tags" itself is not registered
1108+
if ($field == 'tags_type' and !isset($search_fields['tags']) and in_array($request->{$field}, ['has_not_tags', 'has_any_tag'])){
1109+
$search_fields[$field] = $request->{$field};
1110+
}
11061111

11071112
// Register date type and add in URL
11081113
if (in_array($field, $this->a_search_fields_date) and $request->filled($field . '_type')){

src/Public/css/panichd.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ h1, h2, h3, h4, h5, h6 {
146146
}
147147

148148
/* Mark as read / unread button */
149-
.unread_toggle {
149+
#tickets-table .unread_toggle {
150150
background-color: transparent;
151151
border-color: transparent;
152152
}
153-
.unread_toggle .fa-user {
153+
#tickets-table .unread_toggle .fa-user {
154154
color: #ccc;
155155
}
156156

src/Views/tickets/datatable/events.blade.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
$(document).on('click', '.unread_toggle', function(e){
66
e.preventDefault();
77
8+
// Force tooltip close
9+
$(this).tooltip('dispose');
10+
811
$.ajax({
912
type: "POST",
1013
url: '{{ route($setting->grab('main_route').'.ajax.read') }}',

0 commit comments

Comments
 (0)