Author: sevein
Date: Fri Dec  4 15:05:23 2009
New Revision: 4099

Log:
Pass informationObjectId to digital object upload action for checking 
credentials.

Modified:
   trunk/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
   trunk/web/js/multiFileUpload.js

Modified: trunk/apps/qubit/modules/digitalobject/actions/uploadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/digitalobject/actions/uploadAction.class.php       
Fri Dec  4 14:52:26 2009        (r4098)
+++ trunk/apps/qubit/modules/digitalobject/actions/uploadAction.class.php       
Fri Dec  4 15:05:23 2009        (r4099)
@@ -22,9 +22,12 @@
   public function execute($request)
   {
     // Check user authorization
-    if (!QubitAcl::check(QubitInformationObject::getRoot(), 
QubitAclAction::UPDATE_ID))
+    $this->informationObject = 
QubitInformationObject::getById($request->informationObjectId);
+    if (!QubitAcl::check($this->informationObject, QubitAclAction::UPDATE_ID))
     {
-      QubitAcl::forwardUnauthorized();
+      $this->getResponse()->setHttpHeader('Content-Type', 'application/json; 
charset=utf-8');
+
+      return $this->renderText(json_encode(''));
     }
 
     sfLoader::loadHelpers('Qubit');

Modified: trunk/web/js/multiFileUpload.js
==============================================================================
--- trunk/web/js/multiFileUpload.js     Fri Dec  4 14:52:26 2009        (r4098)
+++ trunk/web/js/multiFileUpload.js     Fri Dec  4 15:05:23 2009        (r4099)
@@ -110,7 +110,7 @@
 
     // Start upload
     uploader.setSimUploadLimit(5);
-    uploader.uploadAll(uploadResponsePath);
+    uploader.uploadAll(uploadResponsePath, 'POST', { informationObjectId: 
informationObjectId });
   }
 }
 

--

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.


Reply via email to