Commit 797bb59b authored by Administrator's avatar Administrator

Merge branch 'samuel' into unstable

parents 7902f2bc c2bd2ced
...@@ -130,19 +130,19 @@ class Node(CTENode): ...@@ -130,19 +130,19 @@ class Node(CTENode):
def add_resource(self, **kwargs): def add_resource(self, **kwargs):
print("printing arguments for add_resource():") # print("printing arguments for add_resource():")
print(kwargs) # print(kwargs)
from django.core.files.storage import default_storage # from django.core.files.storage import default_storage
from django.core.files.base import ContentFile # from django.core.files.base import ContentFile
import os # import os
thefile = kwargs["file"] # thefile = kwargs["file"]
path = default_storage.save('tmp/somename.zip', ContentFile(thefile.read())) # path = default_storage.save('tmp/somename.zip', ContentFile(thefile.read()))
tmp_file = os.path.join(MEDIA_ROOT, path) # tmp_file = os.path.join(MEDIA_ROOT, path)
print(tmp_file) # print(tmp_file)
kwargs["file"] = tmp_file # kwargs["file"] = tmp_file
print("final kwargs:") # print("final kwargs:")
print(kwargs) # print(kwargs)
# only for tests # only for tests
......
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<div class="pagination"> <div class="pagination">
<span class="step-links"> <span class="step-links">
{% if documents.has_previous %} {% if documents.has_previous %}
<a onclick="updateDocuments({{ documents.previous_page_number }},true);">previous</a> <a style="cursor: pointer;" onclick="updateDocuments({{ documents.previous_page_number }},true);">previous</a>
{% endif %} {% endif %}
<span class="current"> <span class="current">
Page {{ documents.number }} of {{ documents.paginator.num_pages }}. <strong>Page {{ documents.number }}</strong> of {{ documents.paginator.num_pages }}.
</span> </span>
{% if documents.has_next %} {% if documents.has_next %}
<a onclick="updateDocuments({{ documents.next_page_number }},true);">next</a> <a style="cursor: pointer;" onclick="updateDocuments({{ documents.next_page_number }},true);">next</a>
{% endif %} {% endif %}
</span> </span>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment