Jingga/oms-ItemManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ItemManagement.git synced 2026-02-16 04:08:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2021-04-04 17:53:48 +02:00
parent af797be07c
commit 0a03e9ec8e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Install/Navigation.install.json
View File

@ -318,7 +318,7 @@
"uri": "{/prefix}sales/analysis/item", "uri": "{/prefix}sales/analysis/item",
"target": "self", "target": "self",
"icon": null, "icon": null,
"order": 4, "order": 10,
"from": "ItemManagement", "from": "ItemManagement",
"permission": { "permission": 2, "type": null, "element": null }, "permission": { "permission": 2, "type": null, "element": null },
"parent": 1001602001, "parent": 1001602001,

4
Models/ItemAttributeType.php
View File

@ -115,12 +115,12 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface
{ {
if ($l11n instanceof ItemAttributeTypeL11n) { if ($l11n instanceof ItemAttributeTypeL11n) {
$this->l11n = $l11n; $this->l11n = $l11n;
} elseif ($this->l11n instanceof ItemAttributeTypeL11n && \is_string($l11n)) {
$this->l11n->title = $l11n;
} elseif (\is_string($l11n)) { } elseif (\is_string($l11n)) {
$this->l11n = new ItemAttributeTypeL11n(); $this->l11n = new ItemAttributeTypeL11n();
$this->l11n->title = $l11n; $this->l11n->title = $l11n;
$this->l11n->setLanguage($lang); $this->l11n->setLanguage($lang);
} elseif ($this->l11n instanceof ItemAttributeTypeL11n && \is_string($l11n)) {
$this->l11n->title = $l11n;
} }
} }

1
Theme/Backend/Lang/Navigation.en.lang.php
View File

@ -13,6 +13,7 @@
declare(strict_types=1); declare(strict_types=1);
return ['Navigation' => [ return ['Navigation' => [
'Article' => 'Article',
'Analyze' => 'Analyze', 'Analyze' => 'Analyze',
'Attributes' => 'Attributes', 'Attributes' => 'Attributes',
'Types' => 'Types', 'Types' => 'Types',