Author: david
Date: Tue Jul 26 15:24:55 2011
New Revision: 9388
Log:
Use QubitInformationObject::setPublicationStatus()
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/lib/model/QubitDigitalObject.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Tue Jul 26 15:17:02 2011 (r9387)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Tue Jul 26 15:24:55 2011 (r9388)
@@ -91,7 +91,7 @@
$this->form->setWidget('sourceId', new sfWidgetFormInputHidden);
// Set publication status to "draft"
- $this->resource->setStatus(array('typeId' =>
QubitTerm::STATUS_TYPE_PUBLICATION_ID, 'statusId' =>
sfConfig::get('app_defaultPubStatus', QubitTerm::PUBLICATION_STATUS_DRAFT_ID)));
+
$this->resource->setPublicationStatus(sfConfig::get('app_defaultPubStatus',
QubitTerm::PUBLICATION_STATUS_DRAFT_ID));
}
// Create
@@ -560,12 +560,12 @@
$oldStatus = $this->resource->getStatus(array('typeId' =>
QubitTerm::STATUS_TYPE_PUBLICATION_ID));
if (!isset($oldStatus) && isset($pubStatusId) || $pubStatusId !==
$oldStatus->statusId)
{
- $this->resource->setStatus(array('typeId' =>
QubitTerm::STATUS_TYPE_PUBLICATION_ID, 'statusId' => $pubStatusId));
+ $this->resource->setPublicationStatus($pubStatusId);
// Set pub status for child levels
foreach ($this->resource->informationObjectsRelatedByparentId as $child)
{
- $child->setStatus(array('typeId' =>
QubitTerm::STATUS_TYPE_PUBLICATION_ID, 'statusId' => $pubStatusId));
+ $child->setPublicationStatus($pubStatusId);
}
// Update pub status of descendants
Modified: trunk/lib/model/QubitDigitalObject.php
==============================================================================
--- trunk/lib/model/QubitDigitalObject.php Tue Jul 26 15:17:02 2011
(r9387)
+++ trunk/lib/model/QubitDigitalObject.php Tue Jul 26 15:24:55 2011
(r9388)
@@ -772,9 +772,19 @@
throw new sfException('Couldn\'t find related information object for
digital object');
}
+ $repository = $infoObject->getRepository(array('inherit' => true));
+ if (null !== $repository)
+ {
+ $repositoryId = $repository->id;
+ }
+ else
+ {
+ $repositoryId = 0;
+ }
+
$id = (string) $infoObject->id;
- return '/'.sfConfig::get('app_upload_dir').'/'.$id[0].'/'.$id[1].'/'.$id;
+ return
'/'.sfConfig::get('app_upload_dir').'/r/'.$repositoryId.'/'.$id[0].'/'.$id[1].'/'.$id;
}
/**
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
