Author: jablko
Date: Wed Oct 13 19:52:35 2010
New Revision: 8095
Log:
Drop ->__toString() after dropping QubitDateTime, fixes issue 1795
Modified:
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
trunk/apps/qubit/modules/digitalobject/templates/multiFileUploadSuccess.php
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Modified:
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
==============================================================================
---
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Wed Oct 13 19:45:37 2010 (r8094)
+++
trunk/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Wed Oct 13 19:52:35 2010 (r8095)
@@ -47,7 +47,7 @@
// Paths for uploader javascript
$this->uploadSwfPath =
$this->getRequest()->getRelativeUrlRoot().'/vendor/yui/uploader/assets/uploader.swf';
- $this->uploadResponsePath = $this->context->routing->generate(null,
array('module' => 'digitalobject', 'action' => 'upload'));
+ $this->uploadResponsePath = "{$this->context->routing->generate(null,
array('module' => 'digitalobject', 'action' =>
'upload'))}?".http_build_query(array(session_name() => session_id()));
$this->uploadTmpDir =
$this->getRequest()->getRelativeUrlRoot().'/uploads/tmp';
// Build form
Modified:
trunk/apps/qubit/modules/digitalobject/templates/multiFileUploadSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/templates/multiFileUploadSuccess.php
Wed Oct 13 19:45:37 2010 (r8094)
+++ trunk/apps/qubit/modules/digitalobject/templates/multiFileUploadSuccess.php
Wed Oct 13 19:52:35 2010 (r8095)
@@ -85,7 +85,7 @@
Qubit.multiFileUpload.maxUploadSize = '$maxUploadSize';
Qubit.multiFileUpload.uploadTmpDir = '$uploadTmpDir';
-Qubit.multiFileUpload.uploadResponsePath =
'$uploadResponsePath?http_build_query(array(session_name() => session_id()))';
+Qubit.multiFileUpload.uploadResponsePath = '$uploadResponsePath';
Qubit.multiFileUpload.informationObjectId = '$informationObject->id';
Qubit.multiFileUpload.thumbWidth = 150;
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Wed Oct 13 19:45:37 2010 (r8094)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Wed Oct 13 19:52:35 2010 (r8095)
@@ -432,8 +432,8 @@
$event = new QubitEvent;
$event->actorId = $sourceEvent->actorId;
$event->typeId = $sourceEvent->typeId;
- $event->startDate = $sourceEvent->startDate->__toString();
- $event->endDate = $sourceEvent->endDate->__toString();
+ $event->startDate = $sourceEvent->startDate;
+ $event->endDate = $sourceEvent->endDate;
$event->sourceCulture = $sourceEvent->sourceCulture;
// I18n
--
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.
