model key for reference is now customizable

rexlManu · Nov 19, 2020 · 795f6ca · 795f6ca
1 parent c623e5e
commit 795f6ca
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 8 deletions.
diff --git a/config/config.php b/config/config.php
@@ -130,6 +130,7 @@
     'references-nullable' => true,
     /*
      * Ether you define your models for references or customize the view.
+     * Example: [App/Models/User::class]
      */
     'reference-models' => []
 ];
diff --git a/resources/views/tickets/create.blade.php b/resources/views/tickets/create.blade.php
@@ -47,10 +47,11 @@
                                             @if (!$model->hasReferenceAccess())
                                                 @continue
                                             @endif
-                                            <option value="{{ $model->toReference() }}"
-                                                    @if (old('reference') === $model->toReference())
-                                                    selected
-                                                @endif>@lang(basename(get_class($model))) #{{$model->id}}</option>
+                                            <option
+                                                value="{{ $modelReference = \RexlManu\LaravelTickets\Helper\ReferenceHelper::modelToReference($model) }}"
+                                                @if (old('reference') === $modelReference)
+                                                selected
+                                                @endif>{{ $model->toReference() }}</option>
                                         @endforeach
                                     @endforeach
                                 </select>

diff --git a/resources/views/tickets/show.blade.php b/resources/views/tickets/show.blade.php
@@ -92,7 +92,7 @@ class="custom-file-input @error('files') is-invalid @enderror" id="files">
                             <label>@lang('Reference'):</label>
                             @php($referenceable = $ticket->reference->referenceable)
                             <input class="form-control" type="text"
-                                   value="@lang(basename(get_class($referenceable))) #{{$referenceable->id}}" disabled>
+                                   value="{{ $referenceable->toReference() }}" disabled>
                         </div>
                     @endif
                     <div class="form-group">

diff --git a/src/Helper/ReferenceHelper.php b/src/Helper/ReferenceHelper.php
@@ -0,0 +1,17 @@
+<?php
+
+
+namespace RexlManu\LaravelTickets\Helper;
+
+
+class ReferenceHelper
+{
+
+    public static function modelToReference($model) : string
+    {
+        $type = get_class($model);
+        return "$type,$model->id";
+    }
+
+
+}
diff --git a/src/Interfaces/TicketReference.php b/src/Interfaces/TicketReference.php
@@ -15,7 +15,7 @@ interface TicketReference
     function hasReferenceAccess() : bool;
 
     /**
-     * Combine type and id to a string for forms
+     * Show the name when on selection
      *
      * @return string
      */

diff --git a/src/Traits/HasTicketReference.php b/src/Traits/HasTicketReference.php
@@ -9,8 +9,8 @@ trait HasTicketReference
 
     public function toReference() : string
     {
-        $type = get_class($this);
-        return "$type,$this->id";
+        $type = basename(get_class($this));
+        return "$type #$this->id";
     }
 
 }