Author: jablko
Date: Sat Oct 31 12:17:31 2009
New Revision: 3856
Log:
Merge -r3849:3855 from trunk
Added:
branches/dcb/web/uploads/.sf
- copied unchanged from r3855, trunk/web/uploads/.sf
branches/ica-atom/web/uploads/.sf
- copied unchanged from r3855, trunk/web/uploads/.sf
Modified:
branches/dcb/ (props changed)
branches/dcb/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
branches/dcb/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
branches/dcb/apps/qubit/modules/digitalobject/templates/uploadFormSuccess.php
(props changed)
branches/dcb/apps/qubit/modules/repository/templates/autocompleteSuccess.php
(props changed)
branches/dcb/apps/qubit/modules/term/actions/autocompleteAction.class.php
(props changed)
branches/dcb/data/fixtures/acl.yml (props changed)
branches/dcb/lib/form/SettingsOaiRepositoryForm.class.php (props changed)
branches/dcb/lib/vendor/symfony/ (props changed)
branches/dcb/plugins/qbAclPlugin/modules/aclGroup/actions/deleteAction.class.php
(props changed)
branches/dcb/plugins/qbAclPlugin/modules/aclGroup/actions/protectedAction.class.php
(props changed)
branches/dcb/plugins/qbAclPlugin/modules/aclGroup/templates/deleteSuccess.php
(props changed)
branches/dcb/plugins/qbAclPlugin/modules/aclGroup/templates/protectedSuccess.php
(props changed)
branches/dcb/web/vendor/yui/ (props changed)
branches/ica-atom/ (props changed)
branches/ica-atom/apps/qubit/modules/actor/actions/contextMenuComponent.class.php
(props changed)
branches/ica-atom/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
branches/ica-atom/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
branches/ica-atom/apps/qubit/modules/digitalobject/templates/uploadFormSuccess.php
(props changed)
branches/ica-atom/apps/qubit/modules/repository/templates/autocompleteSuccess.php
(props changed)
branches/ica-atom/apps/qubit/modules/term/actions/autocompleteAction.class.php
(props changed)
branches/ica-atom/data/fixtures/acl.yml (props changed)
branches/ica-atom/lib/form/SettingsOaiRepositoryForm.class.php (props
changed)
branches/ica-atom/lib/vendor/symfony/ (props changed)
branches/ica-atom/plugins/qbAclPlugin/modules/aclGroup/actions/deleteAction.class.php
(props changed)
branches/ica-atom/plugins/qbAclPlugin/modules/aclGroup/actions/protectedAction.class.php
(props changed)
branches/ica-atom/plugins/qbAclPlugin/modules/aclGroup/templates/deleteSuccess.php
(props changed)
branches/ica-atom/plugins/qbAclPlugin/modules/aclGroup/templates/protectedSuccess.php
(props changed)
branches/ica-atom/test/selenium/ (props changed)
branches/ica-atom/web/vendor/yui/ (props changed)
Modified:
branches/dcb/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
==============================================================================
---
branches/dcb/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Sat Oct 31 12:04:59 2009 (r3855)
+++
branches/dcb/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Sat Oct 31 12:17:31 2009 (r3856)
@@ -43,7 +43,7 @@
// Paths for uploader javascript
$this->uploadSwfPath =
$this->getRequest()->getRelativeUrlRoot().'/vendor/yui/uploader/assets/uploader.swf';
- $this->uploadResponsePath =
$this->getRequest()->getRelativeUrlRoot().'/digitalobject/upload';
+ $this->uploadResponsePath = $this->context->routing->generate(null,
array('module' => 'digitalobject', 'action' => 'upload'));
$this->uploadTmpDir =
$this->getRequest()->getRelativeUrlRoot().'/uploads/tmp';
// Handle form submit
Modified:
branches/dcb/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
==============================================================================
---
branches/dcb/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
Sat Oct 31 12:04:59 2009 (r3855)
+++
branches/dcb/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
Sat Oct 31 12:17:31 2009 (r3856)
@@ -24,6 +24,7 @@
sfLoader::loadHelpers('Qubit');
$uploadFiles = array();
+ $warning = null;
foreach ($_FILES as $file)
{
Copied: branches/dcb/web/uploads/.sf (from r3855, trunk/web/uploads/.sf)
==============================================================================
Modified:
branches/ica-atom/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
==============================================================================
---
branches/ica-atom/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Sat Oct 31 12:04:59 2009 (r3855)
+++
branches/ica-atom/apps/qubit/modules/digitalobject/actions/multiFileUploadAction.class.php
Sat Oct 31 12:17:31 2009 (r3856)
@@ -43,7 +43,7 @@
// Paths for uploader javascript
$this->uploadSwfPath =
$this->getRequest()->getRelativeUrlRoot().'/vendor/yui/uploader/assets/uploader.swf';
- $this->uploadResponsePath =
$this->getRequest()->getRelativeUrlRoot().'/digitalobject/upload';
+ $this->uploadResponsePath = $this->context->routing->generate(null,
array('module' => 'digitalobject', 'action' => 'upload'));
$this->uploadTmpDir =
$this->getRequest()->getRelativeUrlRoot().'/uploads/tmp';
// Handle form submit
Modified:
branches/ica-atom/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
==============================================================================
---
branches/ica-atom/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
Sat Oct 31 12:04:59 2009 (r3855)
+++
branches/ica-atom/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
Sat Oct 31 12:17:31 2009 (r3856)
@@ -24,6 +24,7 @@
sfLoader::loadHelpers('Qubit');
$uploadFiles = array();
+ $warning = null;
foreach ($_FILES as $file)
{
Copied: branches/ica-atom/web/uploads/.sf (from r3855, trunk/web/uploads/.sf)
==============================================================================
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
