static_root updated

Author: henrikek

ESSArch_TA/api/templates/api/reception_upload.html

@@ -1,6 +1,4 @@
 {% extends 'admin/base_site.html' %}
-{% load dictionary_extras %}
-{% load js staticfiles%}
 {% load url from future %}
 
 {% block server-side-base %}active{% endblock %}
@@ -19,14 +17,13 @@ <h1 class="title">
 {% endblock %}
 
 {% block app-extra-script %}
-	<!--  {% js "api/js/jquery.js" %} -->
-	{% js "api/js/jquery.ui.widget.js" %}
-	<!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-	{% js "api/js/jquery.iframe-transport.js" %}
-	<!-- The basic File Upload plugin -->
-	{% js "api/js/jquery.fileupload.js" %}
-	<!-- Calculate md5 -->
-	{% js "api/js/spark-md5.js" %}
+        <script type="text/javascript" src="/static/api/js/jquery.ui.widget.js"></script>
+        <!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
+        <script type="text/javascript" src="/static/api/js/jquery.iframe-transport.js"></script>
+        <!-- The basic File Upload plugin -->
+        <script type="text/javascript" src="/static/api/js/jquery.fileupload.js"></script>
+        <!-- Calculate md5 -->
+        <script type="text/javascript" src="/static/api/js/spark-md5.js"></script>
 
   <script type="text/javascript">
     var md5 = "",

ESSArch_TA/api/views.py

@@ -30,7 +30,7 @@
 import shutil
 from django.views.generic.base import TemplateView
 from django.utils.decorators import method_decorator
-from django.contrib.auth.decorators import permission_required
+from django.contrib.auth.decorators import permission_required, login_required
 from django.conf import settings
 from chunked_upload.views import ChunkedUploadView, ChunkedUploadCompleteView
 from configuration.models import (
@@ -45,7 +45,7 @@
 class ReceptionUploadView(TemplateView):
     template_name = 'api/reception_upload.html'
 
-    @method_decorator(permission_required('essarch.change_ingestqueue'))
+    @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):
         return super(ReceptionUploadView, self).dispatch( *args, **kwargs)
 
@@ -91,19 +91,13 @@ def move_to_destination(self, chunked_upload, request):
 
         # Create a new information package folder ready for deliver
         ip_path = os.path.join( eft_path, ip_uuid)
-        print 'ippath'
-        print ip_path
+        dest_file_path = os.path.join(ip_path, chunked_upload.filename)
+
         if os.path.exists(ip_path):
-            print 'path exists'
-            shutil.move(tmp_file_path, ip_path)
-            print 'file moved'
-            
+            shutil.move(tmp_file_path, dest_file_path)
         else:
-            print 'path vill be created'
             os.makedirs(ip_path)
-            print 'file will be moved'
-            shutil.move(tmp_file_path, ip_path)
-            print 'file moved'
+            shutil.move(tmp_file_path, dest_file_path)
 
         chunked_upload.delete(delete_file=True)
 

ESSArch_TA/config/httpd-eta.conf

@@ -44,9 +44,9 @@ Listen 443
     SSLCACertificateFile /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/config/ssl/ca.crt
 
     ###
-    Alias /static/ /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/static/
+    Alias /static/ /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/static_root/
 
-    <Directory /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/static/>
+    <Directory /ESSArch/pd/python/lib/python2.7/site-packages/ESSArch_TA/static_root/>
         Order deny,allow
         Allow from all
     </Directory>