Compare commits
2 Commits
bc1990ff71
...
9399c06ec1
| Author | SHA1 | Date | |
|---|---|---|---|
| 9399c06ec1 | |||
| 8d40dc8242 |
+2
-28
@@ -32,7 +32,6 @@ use KTXF\Resource\Identifier\EntityIdentifierInterface;
|
|||||||
use KTXF\Resource\Identifier\ResourceIdentifiers;
|
use KTXF\Resource\Identifier\ResourceIdentifiers;
|
||||||
use KTXF\Resource\Provider\ResourceServiceIdentityInterface;
|
use KTXF\Resource\Provider\ResourceServiceIdentityInterface;
|
||||||
use KTXF\Resource\Provider\ResourceServiceLocationInterface;
|
use KTXF\Resource\Provider\ResourceServiceLocationInterface;
|
||||||
use KTXF\Resource\Range\RangeAnchorType;
|
|
||||||
use KTXF\Resource\Range\RangeType;
|
use KTXF\Resource\Range\RangeType;
|
||||||
use KTXF\Resource\Sort\ISort;
|
use KTXF\Resource\Sort\ISort;
|
||||||
use Psr\Log\LoggerInterface;
|
use Psr\Log\LoggerInterface;
|
||||||
@@ -779,20 +778,7 @@ class Manager {
|
|||||||
// construct range for entities
|
// construct range for entities
|
||||||
$entityRange = null;
|
$entityRange = null;
|
||||||
if ($range !== null && $range !== [] && isset($range['type'])) {
|
if ($range !== null && $range !== [] && isset($range['type'])) {
|
||||||
$entityRange = $service->entityListRange(RangeType::from($range['type']));
|
$entityRange = $service->entityListRange(RangeType::from($range['type']))->jsonDeserialize($range);
|
||||||
// Cast to IRangeTally if the range type is TALLY
|
|
||||||
if ($entityRange->type() === RangeType::TALLY) {
|
|
||||||
/** @var IRangeTally $entityRange */
|
|
||||||
if (isset($range['anchor'])) {
|
|
||||||
$entityRange->setAnchor(RangeAnchorType::from($range['anchor']));
|
|
||||||
}
|
|
||||||
if (isset($range['position'])) {
|
|
||||||
$entityRange->setPosition($range['position']);
|
|
||||||
}
|
|
||||||
if (isset($range['tally'])) {
|
|
||||||
$entityRange->setTally($range['tally']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// retrieve entities for each collection
|
// retrieve entities for each collection
|
||||||
foreach ($collectionSelected as $collectionId) {
|
foreach ($collectionSelected as $collectionId) {
|
||||||
@@ -868,19 +854,7 @@ class Manager {
|
|||||||
// construct range for entities
|
// construct range for entities
|
||||||
$entityRange = null;
|
$entityRange = null;
|
||||||
if ($range !== null && $range !== [] && isset($range['type'])) {
|
if ($range !== null && $range !== [] && isset($range['type'])) {
|
||||||
$entityRange = $service->entityListRange(RangeType::from($range['type']));
|
$entityRange = $service->entityListRange(RangeType::from($range['type']))->jsonDeserialize($range);
|
||||||
if ($entityRange->type() === RangeType::TALLY) {
|
|
||||||
/** @var IRangeTally $entityRange */
|
|
||||||
if (isset($range['anchor'])) {
|
|
||||||
$entityRange->setAnchor(RangeAnchorType::from($range['anchor']));
|
|
||||||
}
|
|
||||||
if (isset($range['position'])) {
|
|
||||||
$entityRange->setPosition($range['position']);
|
|
||||||
}
|
|
||||||
if (isset($range['tally'])) {
|
|
||||||
$entityRange->setTally($range['tally']);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
// yield entities for each collection individually
|
// yield entities for each collection individually
|
||||||
foreach ($collectionSelected as $collectionId) {
|
foreach ($collectionSelected as $collectionId) {
|
||||||
|
|||||||
Generated
+3
-3
@@ -2436,9 +2436,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/vuetify": {
|
"node_modules/vuetify": {
|
||||||
"version": "4.0.7",
|
"version": "4.1.4",
|
||||||
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-4.0.7.tgz",
|
"resolved": "https://registry.npmjs.org/vuetify/-/vuetify-4.1.4.tgz",
|
||||||
"integrity": "sha512-SV+YJkBmudY3s9qfZO2ZGUsrD0TDQU8pMBH1ERga9AEyjGvioZuXXh93V9wHxXJphvqRC2NW10Nt2lW9IZQcPw==",
|
"integrity": "sha512-8/H0Yl6h9t07/ExuyZFIRJqAenpKeCiVaRJzbHGfTtuZRZIs5EbtjdFYikPIu6h9thBJAx15PrU4ofa4LvdJag==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"funding": {
|
"funding": {
|
||||||
"type": "github",
|
"type": "github",
|
||||||
|
|||||||
Reference in New Issue
Block a user