Author: david
Date: Fri Sep 23 15:27:42 2011
New Revision: 9807
Log:
Use information object slug for multi-file upload form
Added:
trunk/apps/qubit/modules/informationobject/actions/multiFileUploadAction.class.php
- copied, changed from r9803,
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
trunk/apps/qubit/modules/informationobject/templates/multiFileUploadSuccess.php
- copied, changed from r9803,
trunk/apps/qubit/modules/digitalobject/templates/multiFileUploadSuccess.php
Deleted:
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
trunk/apps/qubit/modules/digitalobject/templates/multiFileUploadSuccess.php
Modified:
trunk/apps/qubit/modules/informationobject/templates/_actions.php
Copied and modified:
trunk/apps/qubit/modules/informationobject/actions/multiFileUploadAction.class.php
(from r9803,
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php)
==============================================================================
---
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Fri Sep 23 11:11:22 2011 (r9803, copy source)
+++
trunk/apps/qubit/modules/informationobject/actions/multiFileUploadAction.class.php
Fri Sep 23 15:27:42 2011 (r9807)
@@ -17,22 +17,22 @@
* along with Qubit Toolkit. If not, see <http://www.gnu.org/licenses/>.
*/
-class DigitalObjectMultiFileUploadAction extends sfAction
+class InformationObjectMultiFileUploadAction extends sfAction
{
public function execute($request)
{
$this->form = new sfForm;
- $this->informationObject =
QubitInformationObject::getById($request->informationObject);
+ $this->resource = $this->getRoute()->resource;
// Check that object exists and that it is not the root
- if (!isset($this->informationObject) ||
!isset($this->informationObject->parent))
+ if (!isset($this->resource) || !isset($this->resource->parent))
{
$this->forward404();
}
// Check user authorization
- if (!QubitAcl::check($this->informationObject, 'update'))
+ if (!QubitAcl::check($this->resource, 'update'))
{
QubitAcl::forwardUnauthorized();
}
@@ -53,10 +53,6 @@
// Build form
$this->form->setValidator('files', new
QubitValidatorCountable(array('required' => true)));
- $this->form->setValidator('informationObject', new sfValidatorInteger);
- $this->form->setWidget('informationObject', new sfWidgetFormInputHidden);
- $this->form->setDefault('informationObject', $this->informationObject->id);
-
$this->form->setValidator('title', new sfValidatorString);
$this->form->setWidget('title', new sfWidgetFormInput);
$this->form->setDefault('title', 'image %dd%');
@@ -100,7 +96,7 @@
// Create an information object for this digital object
$informationObject = new QubitInformationObject;
- $informationObject->parentId = $this->informationObject->id;
+ $informationObject->parentId = $this->resource->id;
if (0 < strlen($title = $file['infoObjectTitle']))
{
@@ -141,6 +137,6 @@
}
}
- $this->redirect(array($this->informationObject, 'module' =>
'informationobject'));
+ $this->redirect(array($this->resource, 'module' => 'informationobject'));
}
}
Modified: trunk/apps/qubit/modules/informationobject/templates/_actions.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/_actions.php Fri Sep
23 15:01:33 2011 (r9806)
+++ trunk/apps/qubit/modules/informationobject/templates/_actions.php Fri Sep
23 15:27:42 2011 (r9807)
@@ -30,7 +30,7 @@
<li><?php echo link_to(__('Link digital object'), array('module'
=> 'digitalobject', 'action' => 'add', 'informationObject' => $resource->id))
?></li>
<?php endif; // has digital object ?>
- <li><?php echo link_to(__('Import digital objects'), array('module'
=> 'digitalobject', 'action' => 'multiFileUpload', 'informationObject' =>
$resource->id)) ?></li>
+ <li><?php echo link_to(__('Import digital objects'),
array($resource, 'module' => 'informationobject', 'action' =>
'multiFileUpload')) ?></li>
<?php endif; // upload quota is non-zero ?>
Copied and modified:
trunk/apps/qubit/modules/informationobject/templates/multiFileUploadSuccess.php
(from r9803,
trunk/apps/qubit/modules/digitalobject/templates/multiFileUploadSuccess.php)
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/templates/multiFileUploadSuccess.php
Fri Sep 23 11:11:22 2011 (r9803, copy source)
+++
trunk/apps/qubit/modules/informationobject/templates/multiFileUploadSuccess.php
Fri Sep 23 15:27:42 2011 (r9807)
@@ -2,7 +2,7 @@
<h1><?php echo __('Import multiple digital objects') ?></h1>
-<h1 class="label"><?php echo render_title(new
sfIsadPlugin($informationObject)) ?> </h1>
+<h1 class="label"><?php echo render_title(new sfIsadPlugin($resource)) ?> </h1>
<noscript>
@@ -11,14 +11,14 @@
</div>
<ul class="actions links">
- <li><?php echo link_to(__('Cancel'), array($informationObject, 'module' =>
'informationobject')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'informationobject')) ?></li>
</ul>
</noscript>
<?php echo $form->renderGlobalErrors() ?>
-<?php echo $form->renderFormTag(url_for(array('module' => 'digitalobject',
'action' => 'multiFileUpload')), array('id' => 'multiFileUploadForm', 'style'
=> 'display: none')) ?>
+<?php echo $form->renderFormTag(url_for(array($resource, 'module' =>
'informationobject', 'action' => 'multiFileUpload')), array('id' =>
'multiFileUploadForm', 'style' => 'display: none')) ?>
<?php echo $form->renderHiddenFields() ?>
@@ -52,7 +52,7 @@
<div class="content">
<ul class="clearfix links">
- <li><?php echo link_to(__('Cancel'), array($informationObject,
'module' => 'informationobject')) ?></li>
+ <li><?php echo link_to(__('Cancel'), array($resource, 'module' =>
'informationobject')) ?></li>
<li><input class="form-submit" type="submit" value="<?php echo
__('Import') ?>"/></li>
</ul>
</div>
@@ -82,7 +82,7 @@
Qubit.multiFileUpload.maxUploadSize = '$maxUploadSize';
Qubit.multiFileUpload.uploadTmpDir = '$uploadTmpDir';
Qubit.multiFileUpload.uploadResponsePath = '$uploadResponsePath';
-Qubit.multiFileUpload.informationObjectId = '$informationObject->id';
+Qubit.multiFileUpload.informationObjectId = '$resource->id';
Qubit.multiFileUpload.thumbWidth = 150;
Qubit.multiFileUpload.i18nUploading =
'{$sf_context->i18n->__('Uploading...')}';
--
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.
