From: Hamatoma Date: Thu, 9 May 2024 10:59:50 +0000 (+0200) Subject: V 0.2.9 Group X-Git-Url: https://gitweb.hamatoma.de/?a=commitdiff_plain;h=055c7aaa320d86e9228fe9c5a24c51781a33c6b3;p=gadeku.git V 0.2.9 Group - neues Modul Group --- diff --git a/CHANGELOG.md b/CHANGELOG.md index 3643768..082365d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# V 0.2.9 Group + +## Added: +- neues Modul Group + # V 0.2.8 MediaWiki Unicode Navigation ## Changed diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php new file mode 120000 index 0000000..5717662 --- /dev/null +++ b/app/Http/Controllers/GroupController.php @@ -0,0 +1 @@ +../../../vendor/hamatoma/laraknife/templates/Http/Controllers/GroupController.php \ No newline at end of file diff --git a/app/Http/Controllers/PageController.php b/app/Http/Controllers/PageController.php index 5a04889..ab56936 100644 --- a/app/Http/Controllers/PageController.php +++ b/app/Http/Controllers/PageController.php @@ -115,6 +115,10 @@ class PageController extends Controller $optionsMarkup = SProperty::optionsByScope('markup', $page->markup_scope, ''); $optionsLanguage = SProperty::optionsByScope('localization', $page->language_scope, ''); $fields = $request->btnSubmit !== 'btnPreview' ? null : ['preview' => $this->asHtml($page)]; + if ($page->audio_id != null){ + $file = File::find($page->audio_id); + $fields['audio'] = $file->filename; + } $context = new ContextLaraKnife($request, $fields, $page); $rc = view('page.edit', [ 'context' => $context, diff --git a/app/Models/Group.php b/app/Models/Group.php new file mode 120000 index 0000000..e97de9c --- /dev/null +++ b/app/Models/Group.php @@ -0,0 +1 @@ +../../vendor/hamatoma/laraknife/templates/Models/Group.php \ No newline at end of file diff --git a/composer.lock b/composer.lock index ebffb40..eece460 100644 --- a/composer.lock +++ b/composer.lock @@ -1056,7 +1056,7 @@ "dist": { "type": "path", "url": "../laraknife", - "reference": "8a0789ea4dc11c715341bfeb32f23113068a3384" + "reference": "542a161082cb090cb635241880b7fd56267d66d1" }, "require-dev": { "phpunit/phpunit": "11.0.x-dev" @@ -1087,16 +1087,16 @@ }, { "name": "laravel/framework", - "version": "v11.6.0", + "version": "v11.7.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e090ee638ebd4ce221d8bad43b49bbf59ea70ae5" + "reference": "e5ac72f513f635f208024aa76b8a04efc1b47f93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e090ee638ebd4ce221d8bad43b49bbf59ea70ae5", - "reference": "e090ee638ebd4ce221d8bad43b49bbf59ea70ae5", + "url": "https://api.github.com/repos/laravel/framework/zipball/e5ac72f513f635f208024aa76b8a04efc1b47f93", + "reference": "e5ac72f513f635f208024aa76b8a04efc1b47f93", "shasum": "" }, "require": { @@ -1288,7 +1288,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-04-30T13:30:08+00:00" + "time": "2024-05-07T13:41:51+00:00" }, { "name": "laravel/prompts", diff --git a/database/migrations/2024_05_09_063057_create_groups_table.php b/database/migrations/2024_05_09_063057_create_groups_table.php new file mode 120000 index 0000000..18f5a97 --- /dev/null +++ b/database/migrations/2024_05_09_063057_create_groups_table.php @@ -0,0 +1 @@ +../../vendor/hamatoma/laraknife/templates/database/migrations/2024_05_09_063057_create_groups_table.php \ No newline at end of file diff --git a/database/seeders/GroupSeeder.php b/database/seeders/GroupSeeder.php new file mode 120000 index 0000000..30eab2b --- /dev/null +++ b/database/seeders/GroupSeeder.php @@ -0,0 +1 @@ +../../vendor/hamatoma/laraknife/templates/database/seeders/GroupSeeder.php \ No newline at end of file diff --git a/database/seeders/seeders b/database/seeders/seeders new file mode 120000 index 0000000..d617996 --- /dev/null +++ b/database/seeders/seeders @@ -0,0 +1 @@ +../../vendor/hamatoma/laraknife/templates/database/seeders/ \ No newline at end of file diff --git a/lang/de_DE.json b/lang/de_DE.json index dff3349..e1a6bbe 100644 --- a/lang/de_DE.json +++ b/lang/de_DE.json @@ -17,6 +17,7 @@ "Change": "\u00c4ndern", "Change Password of an User": "Passwort eines Benutzers \u00e4ndern", "Change of a File": "\u00c4ndern einer Datei", + "Change of a Group": "\u00c4ndern einer Gruppe", "Change of a Menu Item": "\u00c4ndern einer Men\u00fceintrags", "Change of a Note": "\u00c4ndern einer Notiz", "Change of a Noun": "\u00c4nderung eines Nomens", @@ -36,6 +37,7 @@ "Contents": "Inhalt", "Creation of a Document": "Hochladen eines Dokuments", "Creation of a File": "Hochladen einer Datei", + "Creation of a Group": "Erstellen einer Gruppe", "Creation of a Menu Item": "Erstellen eine Men\u00fceintrags", "Creation of a Note": "Erstellen einer Notiz", "Creation of a Page": "Erstellen einer Seite", @@ -47,6 +49,7 @@ "Date": "Datum", "Delete": "L\u00f6schen", "Deletion of a Document": "L\u00f6schen eines Dokuments", + "Deletion of a Group": "L\u00f6schen einer Gruppe", "Deletion of a Menu Item": "L\u00f6schen eines Men\u00fceintrags", "Deletion of a Note": "L\u00f6schen einer Notiz", "Deletion of a Page": "L\u00f6schen einer Seite", @@ -71,6 +74,8 @@ "From": "Von", "Genus": "Geschlecht", "German (Germany)": "Deutsch (Deutschland)", + "Group": "Gruppe", + "Groups": "Gruppen", "Hello": "Hallo", "Id": "Id", "Imperfect": "Imperfekt", @@ -86,6 +91,8 @@ "Logout": "Abmelden", "Manager": "Verwalter", "Markup": "Sprachtyp", + "Member": "Mitglied", + "Members": "Mitglieder", "Name": "Name", "New": "Neu", "Next": "Weiter", @@ -99,7 +106,7 @@ "Overwrites the upload name (if not empty)": "\u00dcberschreibt den Hochladenamen (wenn nicht leer)", "Owner": "Besitzer", "Page": "Seite", - "Pages": "Seite", + "Pages": "Seiten", "Pagetype": "Seitentyp", "Participle": "Partizip", "Password": "Passwort", @@ -141,6 +148,7 @@ "To": "Bis", "Total": "Gesamt", "Translation": "\u00dcbersetzung", + "Up": "Auf", "Usage": "Verwendung", "User": "Benutzer", "Users": "Benutzer", diff --git a/resources/views/chapter/edit.blade.php b/resources/views/chapter/edit.blade.php index 621dff3..6d127a5 100644 --- a/resources/views/chapter/edit.blade.php +++ b/resources/views/chapter/edit.blade.php @@ -13,7 +13,7 @@ + filename=" {{$context->valueOf('audio') }}" label="Audio" width2="10" /> @endsection diff --git a/resources/views/group b/resources/views/group new file mode 120000 index 0000000..e11c08b --- /dev/null +++ b/resources/views/group @@ -0,0 +1 @@ +../../vendor/hamatoma/laraknife/resources/views/group \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index d41bd7c..cf62c46 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,6 +14,7 @@ use App\Http\Controllers\ReviewController; use App\Http\Controllers\MenuitemController; use App\Http\Controllers\ChapterController; use App\Http\Controllers\PageController; +use App\Http\Controllers\GroupController; use App\Http\Controllers\SPropertyController; Route::get('/', function () { @@ -38,3 +39,5 @@ ReviewController::routes(); ChapterController::routes(); PageController::routes(); + +GroupController::routes();