matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added link to delete a staging file

Browse Source
This commit is contained in:
Roberto Rosario
2011-02-11 20:18:41 -04:00
parent c716f468d3
commit 1c41b6e05c
5 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
apps/common/templates/generic_confirm.html
View File

@@ -1,6 +1,6 @@
{% extends 'base.html' %}
{% extends "base.html" %}
{% load i18n %}
{% block title %} :: {% trans 'Confirm' %} {{ title }}{% endblock %}
{% block title %} :: {% trans "Confirm" %} {{ title }}{% endblock %}
{% block sidebar %}
{% for subtemplate in subtemplates %}
@@ -12,37 +12,36 @@
<div id="box">
<div class="block" id="block-login">
{% if delete_view %}
<h2>{% trans 'Confirm delete' %}</h2>
<h2>{% trans "Confirm delete" %}</h2>
{% else %}
<h2>{% trans 'Confirm' %}</h2>
<h2>{% trans "Confirm" %}</h2>
{% endif %}
<div class="content login">
<form action="" method="post" class="form login">{% csrf_token %}
{% if next %}
<input name='next' type='hidden' value='{{ next }}' />
<input name="next" type="hidden" value="{{ next }}" />
{% endif %}
{% if delete_view %}
{% if object_name %}
<h3>{% blocktrans %}Are you sure you wish to delete {{ object_name }}: {{ object }}?{% endblocktrans %}</h3>
{% else %}
<h3>{% blocktrans %}Are you sure you wish to delete: {{ object }}?{% endblocktrans %}</h3>
{% endif %}
{% else %}
{% if title %}
<h3>{{ title }}</h3>
{% else %}
{% if delete_view %}
{% if object_name %}
<h3>{% blocktrans %}Are you sure you wish to delete {{ object_name }}: {{ object }}?{% endblocktrans %}</h3>
{% else %}
<h3>{% blocktrans %}Are you sure you wish to delete: {{ object }}?{% endblocktrans %}</h3>
{% endif %}
{% endif %}
{% endif %}
<h4>{{ message }}</h4>
<div class="group navform wat-cf">
<button class="button" type="submit">
<img src="{{ MEDIA_URL }}web_theme_media/images/icons/tick.png" alt="{% trans 'Yes' %}" /> {% trans 'Yes' %}
<img src="{{ MEDIA_URL }}web_theme_media/images/icons/tick.png" alt="{% trans 'Yes' %}" /> {% trans "Yes" %}
</button>
{# TODO: Fix back button #}
{% comment %}
<a href="#header" onclick='{% if previous %}window.location.replace("{{ previous }}");{% else %}history.go(-1);{% endif %}' class="button">
<img src="{{ MEDIA_URL }}web_theme_media/images/icons/cross.png" alt="{% trans 'No' %}"/> {% trans 'No' %}
<img src="{{ MEDIA_URL }}web_theme_media/images/icons/cross.png" alt="{% trans 'No' %}"/> {% trans "No" %}
</a>
{% endcomment %}
</div>
</form>
</div>

3
apps/documents/__init__.py
View File

@@ -24,12 +24,13 @@ document_preview = {'text':_('preview'), 'class':'fancybox', 'view':'document_pr
document_download = {'text':_('download'), 'view':'document_download', 'args':'object.id', 'famfam':'page_save'}
staging_file_preview = {'text':_('preview'), 'class':'fancybox', 'view':'staging_file_preview', 'args':'object.id', 'famfam':'drive_magnify'}
staging_file_delete = {'text':_('delete'), 'view':'staging_file_delete', 'args':'object.id', 'famfam':'drive_delete'}
register_links(Document, [document_view, document_edit, document_edit_metadata, document_delete, document_download], menu_name='sidebar')
register_links(Document, [document_list, document_create, document_create_multiple, document_create_sibling], menu_name='sidebar')
register_links(['document_list', 'document_create', 'document_create_multiple', 'upload_document_with_type', 'upload_multiple_documents_with_type'], [document_list, document_create, document_create_multiple], menu_name='sidebar')
register_links(StagingFile, [staging_file_preview])
register_links(StagingFile, [staging_file_preview, staging_file_delete])
register_model_list_columns(Document, [
#{'name':_(u'mimetype'), 'attribute':'file_mimetype'},

1
apps/documents/urls.py
View File

@@ -23,4 +23,5 @@ urlpatterns = patterns('documents.views',
url(r'^document/(?P<document_id>\d+)/create/siblings/$', 'document_create_sibling', {'multiple':False}, 'document_create_sibling'),
url(r'^staging_file/(?P<staging_file_id>\w+)/preview/$', 'staging_file_preview', (), 'staging_file_preview'),
url(r'^staging_file/(?P<staging_file_id>\w+)/delete/$', 'staging_file_delete', (), 'staging_file_delete'),
)

20
apps/documents/views.py
View File

@@ -387,4 +387,24 @@ def staging_file_preview(request, staging_file_id):
return serve_file(request, File(file=open(output_file, 'r')))
except Exception, e:
return serve_file(request, File(file=open('%simages/1297211435_error.png' % settings.MEDIA_ROOT, 'r')))
def staging_file_delete(request, staging_file_id):
staging_file = StagingFile.get(staging_file_id)
next = request.POST.get('next', request.GET.get('next', request.META.get('HTTP_REFERER', None)))
previous = request.POST.get('previous', request.GET.get('previous', request.META.get('HTTP_REFERER', None)))
if request.method == 'POST':
try:
staging_file.delete()
messages.success(request, _(u'Staging file delete successfully.'))
except Exception, e:
messages.error(request, e)
return HttpResponseRedirect(next)
return render_to_response('generic_confirm.html', {
'delete_view':True,
'object':staging_file,
'next':next,
'previous':previous,
}, context_instance=RequestContext(request))

1
docs/TODO
View File

@@ -24,6 +24,7 @@
* Show document metadata in document list - DONE
* Add css grids - DONE
* If theres only one document type on db skip step 1 of wizard - DONE
* Be able to delete staging file - DONE
* Document list filtering by metadata
* Filterform date filtering widget
* Validate GET data before saving file