Search by URL including text fields

Author: xaviqv

src/Controllers/TicketsController.php

@@ -35,6 +35,7 @@ class TicketsController extends Controller
 	protected $member;
 	protected $a_search_fields_numeric = ['creator_id', 'user_id', 'status_id', 'priority_id', 'category_id', 'agent_id'];
 	protected $a_search_fields_text = ['subject', 'content', 'intervention'];
+	protected $a_search_fields_text_special = ['comments', 'attachment_name', 'any_text_field'];
 	protected $a_search_fields_date = ['start_date', 'limit_date', 'created_at', 'completed_at', 'updated_at'];
 
     public function __construct(Ticket $tickets, \PanicHDMember $member)
@@ -776,8 +777,9 @@ public function search_form($parameters = null)
 
 		// If there are search parameters
 		if (!is_null($parameters)){
-			// Array of the parameters we allow to use via URL
-			$a_valid_params = array_merge($this->a_search_fields_numeric, ['department_id', 'list', 'tags']);
+			// URL allowed parameter arrays
+			$a_numeric_params = array_merge($this->a_search_fields_numeric, ['department_id', 'list', 'tags']);
+			$a_text_params = array_merge($this->a_search_fields_text, $this->a_search_fields_text_special);
 
 			$a_temp = explode('/', $parameters);
 			$a_parameters = [];
@@ -789,9 +791,13 @@ public function search_form($parameters = null)
 						$key = $param;
 
 					}else{
-						if (in_array($key, $a_valid_params)){
+						if (in_array($key, $a_numeric_params)){
 							// Add param value pair into search_fields array
 							$search_fields[$key] = $param;
+						
+						}elseif(in_array($key, $a_text_params)){
+							// Decode strings in URL
+							$search_fields[$key] = urldecode($param);
 						}
 
 						// key reset to look for a new parameter
@@ -873,7 +879,7 @@ public function register_search_fields(Request $request)
 		session()->forget('search_fields');
 
 		// Check all fields
-		$a_fields = array_merge($this->a_search_fields_numeric, $this->a_search_fields_text, $this->a_search_fields_date, ['department_id', 'list', 'comments', 'attachment_name', 'any_text_field']);
+		$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']);
 		foreach ($a_fields as $field){
 			if($request->filled($field)){
 				$search_fields[$field] = $request->{$field};

src/Views/tickets/search/form.blade.php

@@ -10,7 +10,7 @@
             'class' => 'col-lg-3 col-form-label'
         ]) !!}
         <div class="col-lg-9">
-            {!! CollectiveForm::text('subject', null , ['class' => 'form-control', 'placeholder' => trans('panichd::lang.create-ticket-brief-issue')]) !!}
+            {!! CollectiveForm::text('subject', $search_fields['subject'] ?? null , ['class' => 'form-control', 'placeholder' => trans('panichd::lang.create-ticket-brief-issue')]) !!}
         </div>
     </div>
 
@@ -199,21 +199,21 @@
     <div class="form-group row"><!-- DESCRIPTION -->
         <label for="content" class="col-lg-3 col-form-label">{{trans('panichd::lang.description')}}{{trans('panichd::lang.colon')}}</label>
         <div class="col-lg-9">
-            <textarea class="form-control" rows="2" name="content" cols="50"></textarea>
+            <textarea class="form-control" rows="2" name="content" cols="50">{{ $search_fields['content'] ?? '' }}</textarea>
         </div>
     </div>
 
     <div class="form-group row"><!-- INTERVENTION -->
         <label for="intervention" class="col-lg-3 col-form-label">{{ trans('panichd::lang.intervention') . trans('panichd::lang.colon') }}</label>
         <div class="col-lg-9">
-            <textarea class="form-control" rows="2" name="intervention" cols="50"></textarea>
+            <textarea class="form-control" rows="2" name="intervention" cols="50">{{ $search_fields['intervention'] ?? '' }}</textarea>
         </div>
     </div>
 
     <div class="form-group row"><!-- COMMENTS -->
         <label for="comments" class="col-lg-3 col-form-label">{{ trans('panichd::lang.searchform-comments') . trans('panichd::lang.colon') }}</label>
         <div class="col-lg-9">
-            <textarea class="form-control" rows="2" name="comments" cols="50"></textarea>
+            <textarea class="form-control" rows="2" name="comments" cols="50">{{ $search_fields['comments'] ?? '' }}</textarea>
         </div>
     </div>
 
@@ -223,14 +223,14 @@
                 'class' => 'col-lg-3 col-form-label'
             ]) !!}
             <div class="col-lg-9">
-                {!! CollectiveForm::text('attachment_name', null , ['class' => 'form-control']) !!}
+                {!! CollectiveForm::text('attachment_name', $search_fields['attachment_name'] ?? null , ['class' => 'form-control']) !!}
             </div>
         </div>
     @endif
     <div class="form-group row"><!-- FIND IN ANY TEXT FIELD -->
         <label for="comments" class="col-lg-3 col-form-label tooltip-info" title="{{ trans('panichd::lang.searchform-help-any_text_field') }}">{{ trans('panichd::lang.searchform-any_text_field') . trans('panichd::lang.colon') }} <span class="fa fa-question-circle" style="color: #bbb"></span></label>
         <div class="col-lg-9">
-            <textarea class="form-control" rows="2" name="any_text_field" cols="50"></textarea>
+            <textarea class="form-control" rows="2" name="any_text_field" cols="50">{{ $search_fields['any_text_field'] ?? '' }}</textarea>
         </div>
     </div>