Add 'format_custom_titles' option to disable formatting custom titles

Kyslik · Nov 6, 2019 · a6f3043 · a6f3043
1 parent f9f4eb2
commit a6f3043
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/ColumnSortable/SortableLink.php b/src/ColumnSortable/SortableLink.php
@@ -23,7 +23,7 @@ public static function render(array $parameters)
     {
         list($sortColumn, $sortParameter, $title, $queryParameters, $anchorAttributes) = self::parseParameters($parameters);
 
-        $title = self::applyFormatting($title);
+        $title = self::applyFormatting($title, $sortColumn);
 
         if ($mergeTitleAs = config('columnsortable.inject_title_as', null)) {
             request()->merge([$mergeTitleAs => $title]);
@@ -55,7 +55,7 @@ public static function parseParameters(array $parameters)
         //TODO: needs some checks before determining $title
         $explodeResult    = self::explodeSortParameter($parameters[0]);
         $sortColumn       = (empty($explodeResult)) ? $parameters[0] : $explodeResult[1];
-        $title            = (count($parameters) === 1) ? $sortColumn : $parameters[1];
+        $title            = (count($parameters) === 1) ? null : $parameters[1];
         $queryParameters  = (isset($parameters[2]) && is_array($parameters[2])) ? $parameters[2] : [];
         $anchorAttributes = (isset($parameters[3]) && is_array($parameters[3])) ? $parameters[3] : [];
 
@@ -91,16 +91,23 @@ public static function explodeSortParameter($parameter)
 
 
     /**
-     * @param string|\Illuminate\Contracts\Support\Htmlable $title
+     * @param string|\Illuminate\Contracts\Support\Htmlable|null $title
+     * @param string $sortColumn
      *
      * @return string
      */
-    private static function applyFormatting($title)
+    private static function applyFormatting($title, $sortColumn)
     {
         if ($title instanceof Htmlable) {
             return $title;
         }
 
+        if ($title === null) {
+            $title = $sortColumn;
+        } elseif ( ! config('columnsortable.format_custom_titles', true)){
+            return $title;
+        }
+
         $formatting_function = config('columnsortable.formatting_function', null);
         if ( ! is_null($formatting_function) && function_exists($formatting_function)) {
             $title = call_user_func($formatting_function, $title);

diff --git a/src/config/columnsortable.php b/src/config/columnsortable.php
@@ -81,6 +81,11 @@
      */
     'formatting_function'           => 'ucfirst',
 
+    /*
+    apply formatting function to custom titles as well as column names
+     */
+    'format_custom_titles'          => true,
+
     /*
     inject title parameter in query strings, use null to turn injection off
     example: 'inject_title' => 't' will result in ..user/?t="formatted title of sorted column"