Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Related material improvements #1900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anvit merged 3 commits into from
Apr 10, 2025
Merged

Related material improvements #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81e6785
Normalize related material desc title format
mInnes-archives Dec 3, 2024
fd1eb22
Fix visibility of draft related materials
mInnes-archives Dec 3, 2024
23e9beb
Expand related materials titles
mInnes-archives Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 35 additions & 2 deletions apps/qubit/modules/informationobject/actions/editAction.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,23 @@ protected function addField($name)
$criteria->add(QubitRelation::TYPE_ID, QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID);

foreach ($this->relatedMaterialDescriptions = QubitRelation::get($criteria) as $item) {
$choices[$value[] = $this->context->routing->generate(null, [$item->object, 'module' => 'informationobject'])] = $item->object;
$itemTitle = $item->object->__toString();

if (isset($item->object->levelOfDescription) || isset($item->object->identifier)) {
$itemTitle = "- {$itemTitle}";
if (isset($item->object->identifier)) {
$itemTitle = "{$item->object->referenceCode} {$itemTitle}";
}
if (isset($item->object->levelOfDescription)) {
$itemTitle = "{$item->object->levelOfDescription} {$itemTitle}";
}
}

if (QubitTerm::PUBLICATION_STATUS_DRAFT_ID == $item->object->getPublicationStatus()->statusId) {
$itemTitle .= " ({$item->object->getPublicationStatus()})";
}

$choices[$value[] = $this->context->routing->generate(null, [$item->object, 'module' => 'informationobject'])] = $itemTitle;
}

// Add also relations where it's the object
Expand All @@ -322,7 +338,24 @@ protected function addField($name)

foreach (QubitRelation::get($criteria) as $item) {
$this->relatedMaterialDescriptions[] = $item;
$choices[$value[] = $this->context->routing->generate(null, [$item->subject, 'module' => 'informationobject'])] = $item->subject;

$itemTitle = $item->subject->__toString();

if (isset($item->subject->levelOfDescription) || isset($item->subject->identifier)) {
$itemTitle = "- {$itemTitle}";
if (isset($item->subject->identifier)) {
$itemTitle = "{$item->subject->referenceCode} {$itemTitle}";
}
if (isset($item->subject->levelOfDescription)) {
$itemTitle = "{$item->subject->levelOfDescription} {$itemTitle}";
}
}

if (QubitTerm::PUBLICATION_STATUS_DRAFT_ID == $item->subject->getPublicationStatus()->statusId) {
$itemTitle .= " ({$item->subject->getPublicationStatus()})";
}

$choices[$value[] = $this->context->routing->generate(null, [$item->subject, 'module' => 'informationobject'])] = $itemTitle;
}

break;
Expand Down
45 changes: 41 additions & 4 deletions apps/qubit/modules/informationobject/templates/_relatedMaterialDescriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,50 @@
<div>
<ul>
<?php foreach ($resource->relationsRelatedBysubjectId as $item) { ?>
<?php if (isset($item->type) && QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID == $item->type->id) { ?>
<li><?php echo link_to(render_title($item->object), [$item->object, 'module' => 'informationobject']); ?></li>
<?php if ($sf_user->isAuthenticated() || QubitTerm::PUBLICATION_STATUS_PUBLISHED_ID == $item->object->getPublicationStatus()->statusId) { ?>
<?php $itemTitle = $item->object->__toString(); ?>

<?php if (isset($item->object->levelOfDescription) || isset($item->object->identifier)) { ?>
<?php $itemTitle = "- {$itemTitle}"; ?>
<?php if (isset($item->object->identifier)) { ?>
<?php $itemTitle = "{$item->object->referenceCode} {$itemTitle}"; ?>
<?php } ?>
<?php if (isset($item->object->levelOfDescription)) { ?>
<?php $itemTitle = "{$item->object->levelOfDescription} {$itemTitle}"; ?>
<?php } ?>
<?php } ?>

<?php if (QubitTerm::PUBLICATION_STATUS_DRAFT_ID == $item->object->getPublicationStatus()->statusId) { ?>
<?php $itemTitle .= " ({$item->object->getPublicationStatus()})"; ?>
<?php } ?>

<?php if (isset($item->type) && QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID == $item->type->id) { ?>
<li><?php echo link_to($itemTitle, [$item->object, 'module' => 'informationobject']); ?></li>
<?php } ?>
<?php } ?>
<?php } ?>

<?php foreach ($resource->relationsRelatedByobjectId as $item) { ?>
<?php if (isset($item->type) && QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID == $item->type->id) { ?>
<li><?php echo link_to(render_title($item->subject), [$item->subject, 'module' => 'informationobject']); ?></li>
<?php if ($sf_user->isAuthenticated() || QubitTerm::PUBLICATION_STATUS_PUBLISHED_ID == $item->subject->getPublicationStatus()->statusId) { ?>
<?php $itemTitle = $item->subject->__toString(); ?>

<?php if (isset($item->subject->levelOfDescription) || isset($item->subject->identifier)) { ?>
<?php $itemTitle = "- {$itemTitle}"; ?>
<?php if (isset($item->subject->identifier)) { ?>
<?php $itemTitle = "{$item->subject->referenceCode} {$itemTitle}"; ?>
<?php } ?>
<?php if (isset($item->subject->levelOfDescription)) { ?>
<?php $itemTitle = "{$item->subject->levelOfDescription} {$itemTitle}"; ?>
<?php } ?>
<?php } ?>

<?php if (QubitTerm::PUBLICATION_STATUS_DRAFT_ID == $item->subject->getPublicationStatus()->statusId) { ?>
<?php $itemTitle .= " ({$item->subject->getPublicationStatus()})"; ?>
<?php } ?>

<?php if (isset($item->type) && QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID == $item->type->id) { ?>
<li><?php echo link_to($itemTitle, [$item->subject, 'module' => 'informationobject']); ?></li>
<?php } ?>
<?php } ?>
<?php } ?>
</ul>
Expand Down
45 changes: 41 additions & 4 deletions ...s/arDominionB5Plugin/modules/informationobject/templates/_relatedMaterialDescriptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,50 @@
<div class="<?php echo render_b5_show_value_css_classes(); ?>">
<ul class="<?php echo render_b5_show_list_css_classes(); ?>">
<?php foreach ($resource->relationsRelatedBysubjectId as $item) { ?>
<?php if (isset($item->type) && QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID == $item->type->id) { ?>
<li><?php echo link_to(render_title($item->object), [$item->object, 'module' => 'informationobject']); ?></li>
<?php if ($sf_user->isAuthenticated() || QubitTerm::PUBLICATION_STATUS_PUBLISHED_ID == $item->object->getPublicationStatus()->statusId) { ?>
<?php $itemTitle = $item->object->__toString(); ?>

<?php if (isset($item->object->levelOfDescription) || isset($item->object->identifier)) { ?>
<?php $itemTitle = "- {$itemTitle}"; ?>
<?php if (isset($item->object->identifier)) { ?>
<?php $itemTitle = "{$item->object->referenceCode} {$itemTitle}"; ?>
<?php } ?>
<?php if (isset($item->object->levelOfDescription)) { ?>
<?php $itemTitle = "{$item->object->levelOfDescription} {$itemTitle}"; ?>
<?php } ?>
<?php } ?>

<?php if (QubitTerm::PUBLICATION_STATUS_DRAFT_ID == $item->object->getPublicationStatus()->statusId) { ?>
<?php $itemTitle .= " ({$item->object->getPublicationStatus()})"; ?>
<?php } ?>

<?php if (isset($item->type) && QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID == $item->type->id) { ?>
<li><?php echo link_to($itemTitle, [$item->object, 'module' => 'informationobject']); ?></li>
<?php } ?>
<?php } ?>
<?php } ?>

<?php foreach ($resource->relationsRelatedByobjectId as $item) { ?>
<?php if (isset($item->type) && QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID == $item->type->id) { ?>
<li><?php echo link_to(render_title($item->subject), [$item->subject, 'module' => 'informationobject']); ?></li>
<?php if ($sf_user->isAuthenticated() || QubitTerm::PUBLICATION_STATUS_PUBLISHED_ID == $item->subject->getPublicationStatus()->statusId) { ?>
<?php $itemTitle = $item->subject->__toString(); ?>

<?php if (isset($item->subject->levelOfDescription) || isset($item->subject->identifier)) { ?>
<?php $itemTitle = "- {$itemTitle}"; ?>
<?php if (isset($item->subject->identifier)) { ?>
<?php $itemTitle = "{$item->subject->referenceCode} {$itemTitle}"; ?>
<?php } ?>
<?php if (isset($item->subject->levelOfDescription)) { ?>
<?php $itemTitle = "{$item->subject->levelOfDescription} {$itemTitle}"; ?>
<?php } ?>
<?php } ?>

<?php if (QubitTerm::PUBLICATION_STATUS_DRAFT_ID == $item->subject->getPublicationStatus()->statusId) { ?>
<?php $itemTitle .= " ({$item->subject->getPublicationStatus()})"; ?>
<?php } ?>

<?php if (isset($item->type) && QubitTerm::RELATED_MATERIAL_DESCRIPTIONS_ID == $item->type->id) { ?>
<li><?php echo link_to($itemTitle, [$item->subject, 'module' => 'informationobject']); ?></li>
<?php } ?>
<?php } ?>
<?php } ?>
</ul>
Expand Down
Loading