From d6b767eb930aeeae218ad2b695f9b0814953ef44 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 24 Aug 2018 01:23:13 -0400 Subject: [PATCH] Fix typos from the 3-way "papercut" patch merge. Signed-off-by: Roberto Rosario --- mayan/apps/checkouts/views.py | 2 +- mayan/apps/document_states/views.py | 6 +++--- mayan/apps/metadata/views.py | 7 +++++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/mayan/apps/checkouts/views.py b/mayan/apps/checkouts/views.py index 40acbcf7bd..e5d7f6ef19 100644 --- a/mayan/apps/checkouts/views.py +++ b/mayan/apps/checkouts/views.py @@ -83,7 +83,6 @@ class CheckoutListView(DocumentListView): context = super(CheckoutListView, self).get_extra_context() context.update( { - 'title': _('Documents checked out'), 'extra_columns': ( { 'name': _('User'), @@ -111,6 +110,7 @@ class CheckoutListView(DocumentListView): 'time.' ), 'no_results_title': _('No documents have been checked out'), + 'title': _('Documents checked out'), } ) return context diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py index 1fa21f3243..045747bd5c 100644 --- a/mayan/apps/document_states/views.py +++ b/mayan/apps/document_states/views.py @@ -514,12 +514,12 @@ class SetupWorkflowStateListView(SingleObjectListView): self.request, {'object': self.get_workflow()} ) ), - 'no_results_title': _( - 'This workflow doesn\'t have any states' - ), 'no_results_text': _( 'Create states and link them using transitions.' ), + 'no_results_title': _( + 'This workflow doesn\'t have any states' + ), 'object': self.get_workflow(), 'title': _('States of workflow: %s') % self.get_workflow() } diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index 93bdf51227..3594d90771 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -267,6 +267,13 @@ class DocumentMetadataEditView(MultipleObjectFormActionView): def get_extra_context(self): queryset = self.get_queryset() + id_list = ','.join( + map( + force_text, + queryset.values_list('pk', flat=True) + ) + ) + if queryset.count() == 1: no_results_main_link = link_metadata_add.resolve( context=RequestContext(