mirror of
https://github.com/Karaka-Management/oms-ItemManagement.git
synced 2026-02-04 14:38:40 +00:00
bug fixes
This commit is contained in:
parent
af797be07c
commit
0a03e9ec8e
|
|
@ -318,7 +318,7 @@
|
|||
"uri": "{/prefix}sales/analysis/item",
|
||||
"target": "self",
|
||||
"icon": null,
|
||||
"order": 4,
|
||||
"order": 10,
|
||||
"from": "ItemManagement",
|
||||
"permission": { "permission": 2, "type": null, "element": null },
|
||||
"parent": 1001602001,
|
||||
|
|
|
|||
|
|
@ -115,12 +115,12 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface
|
|||
{
|
||||
if ($l11n instanceof ItemAttributeTypeL11n) {
|
||||
$this->l11n = $l11n;
|
||||
} elseif ($this->l11n instanceof ItemAttributeTypeL11n && \is_string($l11n)) {
|
||||
$this->l11n->title = $l11n;
|
||||
} elseif (\is_string($l11n)) {
|
||||
$this->l11n = new ItemAttributeTypeL11n();
|
||||
$this->l11n->title = $l11n;
|
||||
$this->l11n->setLanguage($lang);
|
||||
} elseif ($this->l11n instanceof ItemAttributeTypeL11n && \is_string($l11n)) {
|
||||
$this->l11n->title = $l11n;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@
|
|||
declare(strict_types=1);
|
||||
|
||||
return ['Navigation' => [
|
||||
'Article' => 'Article',
|
||||
'Analyze' => 'Analyze',
|
||||
'Attributes' => 'Attributes',
|
||||
'Types' => 'Types',
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user