Merge branch 'develop'

This commit is contained in:
Dennis Eichhorn 2024-04-24 23:44:27 +00:00
commit ddd23c08de
21 changed files with 36 additions and 22 deletions

View File

@ -13,10 +13,15 @@ on:
- cron: '0 0 1,15 * *' - cron: '0 0 1,15 * *'
jobs: jobs:
general_module_workflow: general_module_workflow_php:
uses: Karaka-Management/Karaka/.github/workflows/php_template.yml@develop uses: Karaka-Management/Karaka/.github/workflows/php_template.yml@develop
secrets: secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_PAT: ${{ secrets.GH_PAT }} GH_PAT: ${{ secrets.GH_PAT }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
general_module_workflow_js:
uses: Karaka-Management/Karaka/.github/workflows/js_template.yml@develop
secrets:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_PAT: ${{ secrets.GH_PAT }}
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search\Admin * @package Modules\Search\Admin
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules * @package Modules
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
@ -22,6 +22,8 @@ return [
[ [
'dest' => '\Modules\Search\Controller\ApiController:search', 'dest' => '\Modules\Search\Controller\ApiController:search',
'verb' => RouteVerb::ANY, 'verb' => RouteVerb::ANY,
'csrf' => true,
'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules * @package Modules
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
@ -18,10 +18,11 @@ use phpOMS\Account\PermissionType;
use phpOMS\Router\RouteVerb; use phpOMS\Router\RouteVerb;
return [ return [
'^.*/search(\?.*|$)' => [ '^/search(\?.*|$)' => [
[ [
'dest' => '\Modules\Search\Controller\BackendController:search', 'dest' => '\Modules\Search\Controller\BackendController:search',
'verb' => RouteVerb::ANY, 'verb' => RouteVerb::ANY,
'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search\Admin * @package Modules\Search\Admin
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search\Admin * @package Modules\Search\Admin
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search\Admin * @package Modules\Search\Admin
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search * @package Modules\Search
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search * @package Modules\Search
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search * @package Modules\Search
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

0
ICAL.txt → ICLA.txt Executable file → Normal file
View File

View File

@ -46,3 +46,7 @@ Unless required by applicable law or agreed to in writing, Licensor provides the
7. Limitation of Liability 7. Limitation of Liability
In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages. In no event and under no legal theory, whether in tort (including negligence), contract, or otherwise, unless required by applicable law (such as deliberate and grossly negligent acts) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work (including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses), even if such Contributor has been advised of the possibility of such damages.
8. Future Changes
The Licensor may change the License for future versions as he sees fit.

View File

@ -9,12 +9,12 @@ export class Navigation {
constructor (data) constructor (data)
{ {
if (typeof data === 'undefined') { if (typeof data === 'undefined') {
this.scrollPosition = {x: 0, y: 0}; this.scrollPosition = { x: 0, y: 0 };
this.activeLinks = {}; this.activeLinks = {};
this.visible = true; this.visible = true;
this.openCategories = {}; this.openCategories = {};
} else { } else {
this.scrollPosition = typeof data.scrollPosition === 'undefined' ? {x : 0, y : 0} : data.scrollPosition; this.scrollPosition = typeof data.scrollPosition === 'undefined' ? { x: 0, y: 0 } : data.scrollPosition;
this.activeLinks = typeof data.activeLinks === 'undefined' ? {} : data.activeLinks; this.activeLinks = typeof data.activeLinks === 'undefined' ? {} : data.activeLinks;
this.visible = typeof data.visible === 'undefined' ? true : data.visible; this.visible = typeof data.visible === 'undefined' ? true : data.visible;
this.openCategories = typeof data.openCategories === 'undefined' ? {} : data.openCategories; this.openCategories = typeof data.openCategories === 'undefined' ? {} : data.openCategories;

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search\Models * @package Modules\Search\Models
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Localization * @package Modules\Localization
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Localization * @package Modules\Localization
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\QA * @package Modules\QA
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn
@ -51,12 +51,14 @@ foreach ($this->data as $controller) :
</a> </a>
<td class="sm-hidden"> <td class="sm-hidden">
<?php if (!empty($data['tags'])) : ?> <?php if (!empty($data['tags'])) : ?>
<div class="tag-list">
<?php foreach ($data['tags'] as $tag) : ?> <?php foreach ($data['tags'] as $tag) : ?>
<span class="tag" style="background: <?= $this->printHtml($tag->color); ?>"> <span class="tag" style="background: <?= $this->printHtml($tag->color); ?>">
<?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?> <?= empty($tag->icon) ? '' : '<i class="g-icon">' . $this->printHtml($tag->icon) . '</i>'; ?>
<?= $this->printHtml($tag->getL11n()); ?> <?= $this->printHtml($tag->getL11n()); ?>
</span> </span>
<?php endforeach; ?> <?php endforeach; ?>
</div>
<?php endif; ?> <?php endif; ?>
<?php endforeach; ?> <?php endforeach; ?>
</table> </table>

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package tests * @package tests
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules/tests * @package Modules/tests
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package Modules\Search\tests * @package Modules\Search\tests
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn

View File

@ -2,7 +2,7 @@
/** /**
* Jingga * Jingga
* *
* PHP Version 8.1 * PHP Version 8.2
* *
* @package tests * @package tests
* @copyright Dennis Eichhorn * @copyright Dennis Eichhorn