V 0.4.4 MediaWiki, PageController

- MediaWiki: Wenn 2.ter Parameter von %mark() mit "." beginnt, ist das der Klassenname

- PageController:
  - index(): Korrektur Anzeige Besitzer
  - neu: Anzeige "Name"

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a6ee473a0af7343a08fff9d96cf3432e26cba50..ead613f5a07c86da5d488e67ddf4ea39e7c7633e 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# V 0.4.4 MediaWiki, PageController
+
+## Added
+- MediaWiki: Wenn 2.ter Parameter von %mark() mit "." beginnt, ist das der Klassenname
+
+## Changed
+- PageController: 
+  - index(): Korrektur Anzeige Besitzer
+  - neu: Anzeige "Name"
+
 # V 0.4.3 Page-Export
 
 # Changed

diff --git a/app/Helpers/MediaWiki.php b/app/Helpers/MediaWiki.php
index c5034ed55fbde790a0492fe5b5a7982a257dff57..10dc48373e7077070834416f2d865b49daa08b80 100644 (file)
--- a/app/Helpers/MediaWiki.php
+++ b/app/Helpers/MediaWiki.php
@@ -45,7 +45,12 @@ class MediaWiki extends MediaWikiBase
                     break;
                 case 'mark':
                     $mode = count($matches) > 3 ? substr($matches[3], 1) : 'info';
-                    $rc = "<span class=\"lkn-text-$mode\">$matches[2]</span>";
+                    if (str_starts_with($mode, '.')){
+                        $mode = substr($mode, 1);
+                        $rc = "<span class=\"$mode\">$matches[2]</span>";
+                    } else {
+                        $rc = "<span class=\"lkn-text-$mode\">$matches[2]</span>";
+                    }
                     break;
                 case 'add':
                     $rc = '<ins class="lkn-ins">' . (count($matches) >= 4 ? ($matches[2] . $matches[3]) : $matches[2]) . '</ins>';

diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php
index 55e926f9ebc6199f763227d54d4004fb513913ba..05ce5bde64a1d4942c292f8e8e8884a633b1c70a 100644 (file)
--- a/app/Http/Controllers/PageController.php
+++ b/app/Http/Controllers/PageController.php
@@ -184,7 +184,7 @@ FROM pages t0
 LEFT JOIN sproperties t1 ON t1.id=t0.pagetype_scope
 LEFT JOIN sproperties t2 ON t2.id=t0.markup_scope
 LEFT JOIN sproperties t3 ON t3.id=t0.language_scope
-LEFT JOIN sproperties t4 ON t4.id=t0.owner_id
+LEFT JOIN users t4 ON t4.id=t0.owner_id
 ";
             $parameters = [];
             $fields = $request->all();
@@ -229,8 +229,8 @@ LEFT JOIN sproperties t4 ON t4.id=t0.owner_id
                     'pagination' => $pagination
                 ]);
             }
-            return $rc;
         }
+        return $rc;
     }
     /**
      * Returns the validation rules.

diff --git a/composer.lock b/composer.lock
index 57bb023d319600099f1189f6207176d5e053d671..9387e1582d3cbfb0d99a3f72d86a2fdd70f858eb 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1056,7 +1056,7 @@
             "dist": {
                 "type": "path",
                 "url": "../laraknife",
-                "reference": "31c805ca6f97201252f11b8bdd36192fc6fe7951"
+                "reference": "4a3bfab6a713d8615bc3a37c2c30d8a1014b8b63"
             },
             "require-dev": {
                 "phpunit/phpunit": "11.0.x-dev"
@@ -6258,16 +6258,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.1",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
-                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
+                "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c",
                 "shasum": ""
             },
             "require": {
@@ -6275,11 +6275,12 @@
             },
             "conflict": {
                 "doctrine/collections": "<1.6.8",
-                "doctrine/common": "<2.13.3 || >=3,<3.2.2"
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
             },
             "require-dev": {
                 "doctrine/collections": "^1.6.8",
                 "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
             "type": "library",
@@ -6305,7 +6306,7 @@
             ],
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0"
             },
             "funding": [
                 {
@@ -6313,7 +6314,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-03-08T13:26:56+00:00"
+            "time": "2024-06-12T14:39:25+00:00"
         },
         {
             "name": "nunomaduro/collision",
@@ -7931,24 +7932,98 @@
             ],
             "time": "2024-04-24T13:22:11+00:00"
         },
+        {
+            "name": "spatie/error-solutions",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/error-solutions.git",
+                "reference": "202108314a6988ede156fba1b3ea80a784c1734a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/202108314a6988ede156fba1b3ea80a784c1734a",
+                "reference": "202108314a6988ede156fba1b3ea80a784c1734a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "illuminate/broadcasting": "^10.0|^11.0",
+                "illuminate/cache": "^10.0|^11.0",
+                "illuminate/support": "^10.0|^11.0",
+                "livewire/livewire": "^2.11|^3.3.5",
+                "openai-php/client": "^0.10.1",
+                "orchestra/testbench": "^7.0|8.22.3|^9.0",
+                "pestphp/pest": "^2.20",
+                "phpstan/phpstan": "^1.11",
+                "psr/simple-cache": "^3.0",
+                "psr/simple-cache-implementation": "^3.0",
+                "spatie/ray": "^1.28",
+                "symfony/cache": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "vlucas/phpdotenv": "^5.5"
+            },
+            "suggest": {
+                "openai-php/client": "Require get solutions from OpenAI",
+                "simple-cache-implementation": "To cache solutions from OpenAI"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\Ignition\\": "legacy/ignition",
+                    "Spatie\\ErrorSolutions\\": "src",
+                    "Spatie\\LaravelIgnition\\": "legacy/laravel-ignition"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ruben Van Assche",
+                    "email": "ruben@spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "This is my package error-solutions",
+            "homepage": "https://github.com/spatie/error-solutions",
+            "keywords": [
+                "error-solutions",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/error-solutions/issues",
+                "source": "https://github.com/spatie/error-solutions/tree/1.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/Spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-06-12T14:49:54+00:00"
+        },
         {
             "name": "spatie/flare-client-php",
-            "version": "1.6.0",
+            "version": "1.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/flare-client-php.git",
-                "reference": "220a7c8745e9fa427d54099f47147c4b97fe6462"
+                "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/220a7c8745e9fa427d54099f47147c4b97fe6462",
-                "reference": "220a7c8745e9fa427d54099f47147c4b97fe6462",
+                "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/097040ff51e660e0f6fc863684ac4b02c93fa234",
+                "reference": "097040ff51e660e0f6fc863684ac4b02c93fa234",
                 "shasum": ""
             },
             "require": {
                 "illuminate/pipeline": "^8.0|^9.0|^10.0|^11.0",
                 "php": "^8.0",
-                "spatie/backtrace": "^1.5.2",
+                "spatie/backtrace": "^1.6.1",
                 "symfony/http-foundation": "^5.2|^6.0|^7.0",
                 "symfony/mime": "^5.2|^6.0|^7.0",
                 "symfony/process": "^5.2|^6.0|^7.0",
@@ -7990,7 +8065,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/flare-client-php/issues",
-                "source": "https://github.com/spatie/flare-client-php/tree/1.6.0"
+                "source": "https://github.com/spatie/flare-client-php/tree/1.7.0"
             },
             "funding": [
                 {
@@ -7998,28 +8073,28 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-22T09:45:39+00:00"
+            "time": "2024-06-12T14:39:14+00:00"
         },
         {
             "name": "spatie/ignition",
-            "version": "1.14.2",
+            "version": "1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/ignition.git",
-                "reference": "5e11c11f675bb5251f061491a493e04a1a571532"
+                "reference": "e3a68e137371e1eb9edc7f78ffa733f3b98991d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/ignition/zipball/5e11c11f675bb5251f061491a493e04a1a571532",
-                "reference": "5e11c11f675bb5251f061491a493e04a1a571532",
+                "url": "https://api.github.com/repos/spatie/ignition/zipball/e3a68e137371e1eb9edc7f78ffa733f3b98991d2",
+                "reference": "e3a68e137371e1eb9edc7f78ffa733f3b98991d2",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "ext-mbstring": "*",
                 "php": "^8.0",
-                "spatie/backtrace": "^1.5.3",
-                "spatie/flare-client-php": "^1.4.0",
+                "spatie/error-solutions": "^1.0",
+                "spatie/flare-client-php": "^1.7",
                 "symfony/console": "^5.4|^6.0|^7.0",
                 "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
@@ -8081,20 +8156,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-29T08:10:20+00:00"
+            "time": "2024-06-12T14:55:22+00:00"
         },
         {
             "name": "spatie/laravel-ignition",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-ignition.git",
-                "reference": "f52124d50122611e8a40f628cef5c19ff6cc5b57"
+                "reference": "3c067b75bfb50574db8f7e2c3978c65eed71126c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/f52124d50122611e8a40f628cef5c19ff6cc5b57",
-                "reference": "f52124d50122611e8a40f628cef5c19ff6cc5b57",
+                "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/3c067b75bfb50574db8f7e2c3978c65eed71126c",
+                "reference": "3c067b75bfb50574db8f7e2c3978c65eed71126c",
                 "shasum": ""
             },
             "require": {
@@ -8103,8 +8178,7 @@
                 "ext-mbstring": "*",
                 "illuminate/support": "^10.0|^11.0",
                 "php": "^8.1",
-                "spatie/flare-client-php": "^1.5",
-                "spatie/ignition": "^1.14",
+                "spatie/ignition": "^1.15",
                 "symfony/console": "^6.2.3|^7.0",
                 "symfony/var-dumper": "^6.2.3|^7.0"
             },
@@ -8173,7 +8247,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-02T13:42:49+00:00"
+            "time": "2024-06-12T15:01:18+00:00"
         },
         {
             "name": "symfony/yaml",

diff --git a/resources/views/page/index.blade.php b/resources/views/page/index.blade.php
index 0c4d12a55a53110fac9ed34831d4849fba3c994e..f5cca1cd3e52bfc4c2e8c7383ec8186302fb715e 100644 (file)
--- a/resources/views/page/index.blade.php
+++ b/resources/views/page/index.blade.php
@@ -20,6 +20,7 @@
             <th></th>
             <th sortId="id">{{__('Id')}}</th>
             <th sortId="title">{{__('Title')}}</th>
+            <th sortId="name">{{__('Name')}}</th>
             <th sortId="pagetype">{{__('Pagetype')}}</th>
             <th sortId="markup">{{__('Markup')}}</th>
             <th sortId="language">{{__('Language')}}</th>
@@ -35,6 +36,7 @@
             </td>
               <td> {{ __($page->id) }}</td>
               <td><a href="/page-showpretty/{{ $page->id }}">{{$page->title}}</a></td>
+              <td> {{ __($page->name) }}</td>
               <td> {{ __($page->pagetype) }}</td>
               <td> {{ __($page->markup) }}</td>
               <td> {{ __($page->language) }}</td>