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

Simplify 'trash can' to just 'trash'.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-03 21:04:47 -04:00
parent ab53270942
commit 589874bec1
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/documents/apps.py
+1 -1
View File
@@ -97,7 +97,7 @@ class DocumentsApp(MayanAppConfig):
SourceColumn(source=Document, label=_('Thumbnail'), attribute=encapsulate(lambda document: document_thumbnail(document, gallery_name='documents:document_list', title=getattr(document, 'label', None), size=setting_thumbnail_size.value))) SourceColumn(source=Document, label=_('Thumbnail'), attribute=encapsulate(lambda document: document_thumbnail(document, gallery_name='documents:document_list', title=getattr(document, 'label', None), size=setting_thumbnail_size.value)))
SourceColumn(source=Document, label=_('Type'), attribute='document_type') SourceColumn(source=Document, label=_('Type'), attribute='document_type')
SourceColumn(source=DeletedDocument, label=_('Type'), attribute='document_type') SourceColumn(source=DeletedDocument, label=_('Type'), attribute='document_type')
SourceColumn(source=DeletedDocument, label=_('Date time deleted'), attribute='deleted_date_time') SourceColumn(source=DeletedDocument, label=_('Date time trashed'), attribute='deleted_date_time')
menu_front_page.bind_links(links=[link_document_list_recent, link_document_list, link_document_list_deleted]) menu_front_page.bind_links(links=[link_document_list_recent, link_document_list, link_document_list_deleted])
menu_setup.bind_links(links=[link_document_type_setup]) menu_setup.bind_links(links=[link_document_type_setup])
mayan/apps/documents/links.py
+2 -2
View File
@@ -67,7 +67,7 @@ link_document_version_download = Link(args='object.pk', permissions=[permission_
# Views # Views
link_document_list = Link(icon='fa fa-file', text=_('All documents'), view='documents:document_list') link_document_list = Link(icon='fa fa-file', text=_('All documents'), view='documents:document_list')
link_document_list_recent = Link(icon='fa fa-clock-o', text=_('Recent documents'), view='documents:document_list_recent') link_document_list_recent = Link(icon='fa fa-clock-o', text=_('Recent documents'), view='documents:document_list_recent')
link_document_list_deleted = Link(icon='fa fa-trash', text=_('Deleted documents'), view='documents:document_list_deleted') link_document_list_deleted = Link(icon='fa fa-trash', text=_('Trash'), view='documents:document_list_deleted')
# Tools # Tools
link_clear_image_cache = Link( link_clear_image_cache = Link(
@@ -76,7 +76,7 @@ link_clear_image_cache = Link(
permissions=[permission_document_tools], text=_('Clear image cache'), permissions=[permission_document_tools], text=_('Clear image cache'),
view='documents:document_clear_image_cache' view='documents:document_clear_image_cache'
) )
link_trash_can_empty = Link(permissions=[permission_empty_trash], text=_('Empty trash can'), view='documents:trash_can_empty') link_trash_can_empty = Link(permissions=[permission_empty_trash], text=_('Empty trash'), view='documents:trash_can_empty')
# Document pages # Document pages
link_document_page_navigation_first = Link(conditional_disable=is_first_page, icon='fa fa-step-backward', keep_query=True, permissions=[permission_document_view], text=_('First page'), view='documents:document_page_navigation_first', args='resolved_object.pk') link_document_page_navigation_first = Link(conditional_disable=is_first_page, icon='fa fa-step-backward', keep_query=True, permissions=[permission_document_view], text=_('First page'), view='documents:document_page_navigation_first', args='resolved_object.pk')
mayan/apps/documents/models.py
+1 -1
View File
@@ -82,7 +82,7 @@ class Document(models.Model):
date_added = models.DateTimeField(verbose_name=_('Added'), auto_now_add=True) date_added = models.DateTimeField(verbose_name=_('Added'), auto_now_add=True)
language = models.CharField(choices=setting_language_choices.value, default=setting_language.value, max_length=8, verbose_name=_('Language')) language = models.CharField(choices=setting_language_choices.value, default=setting_language.value, max_length=8, verbose_name=_('Language'))
in_trash = models.BooleanField(default=False, editable=False, verbose_name=_('In trash?')) in_trash = models.BooleanField(default=False, editable=False, verbose_name=_('In trash?'))
deleted_date_time = models.DateTimeField(blank=True, editable=True, verbose_name=_('Date and time deleted')) deleted_date_time = models.DateTimeField(blank=True, editable=True, verbose_name=_('Date and time trashed'))
objects = DocumentManager() objects = DocumentManager()
passthrough = PassthroughManager() passthrough = PassthroughManager()
mayan/apps/documents/views.py
+3 -3
View File
@@ -84,7 +84,7 @@ class DeletedDocumentListView(DocumentListView):
extra_context = { extra_context = {
'hide_link': True, 'hide_link': True,
'title': _('Deleted documents'), 'title': _('Documents in trash'),
} }
def get_document_queryset(self): def get_document_queryset(self):
@@ -183,7 +183,7 @@ class DocumentPageListView(ParentChildListView):
class EmptyTrashCanView(ConfirmView): class EmptyTrashCanView(ConfirmView):
extra_context = { extra_context = {
'title': _('Empty trash can?') 'title': _('Empty trash?')
} }
view_permission = permission_empty_trash view_permission = permission_empty_trash
action_cancel_redirect = post_action_redirect = reverse_lazy('documents:document_list_deleted') action_cancel_redirect = post_action_redirect = reverse_lazy('documents:document_list_deleted')
@@ -192,7 +192,7 @@ class EmptyTrashCanView(ConfirmView):
for deleted_document in DeletedDocument.objects.all(): for deleted_document in DeletedDocument.objects.all():
deleted_document.delete() deleted_document.delete()
messages.success(request, _('Trash can emptied successfully')) messages.success(request, _('Trash emptied successfully'))
return HttpResponseRedirect(self.get_success_url()) return HttpResponseRedirect(self.get_success_url())