Merge remote-tracking branch 'origin/versions/micro' into versions/minor
Signed-off-by: Roberto Rosario <roberto.rosario@mayan-edms.com>
This commit is contained in:
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Arabic (http://www.transifex.com/rosarior/mayan-edms/language/ar/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-10-16 21:23+0000\n"
|
||||
"Last-Translator: Lyudmil Antonov <lantonov.here@gmail.com>\n"
|
||||
"Language-Team: Bulgarian (http://www.transifex.com/rosarior/mayan-edms/language/bg/)\n"
|
||||
|
||||
@@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Bosnian (Bosnia and Herzegovina) (http://www.transifex.com/rosarior/mayan-edms/language/bs_BA/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-10-22 18:57+0000\n"
|
||||
"Last-Translator: Michal Švábík <snadno@lehce.cz>\n"
|
||||
"Language-Team: Czech (http://www.transifex.com/rosarior/mayan-edms/language/cs/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Danish (Denmark) (http://www.transifex.com/rosarior/mayan-edms/language/da_DK/)\n"
|
||||
|
||||
@@ -14,7 +14,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: German (Germany) (http://www.transifex.com/rosarior/mayan-edms/language/de_DE/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Greek (http://www.transifex.com/rosarior/mayan-edms/language/el/)\n"
|
||||
|
||||
@@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2017-08-15 01:59-0400\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: English (http://www.transifex.com/rosarior/mayan-edms/"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 21:06+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Spanish (http://www.transifex.com/rosarior/mayan-edms/language/es/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Persian (http://www.transifex.com/rosarior/mayan-edms/language/fa/)\n"
|
||||
|
||||
@@ -12,7 +12,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: French (http://www.transifex.com/rosarior/mayan-edms/language/fr/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Hungarian (http://www.transifex.com/rosarior/mayan-edms/language/hu/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Indonesian (http://www.transifex.com/rosarior/mayan-edms/language/id/)\n"
|
||||
|
||||
@@ -10,7 +10,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Italian (http://www.transifex.com/rosarior/mayan-edms/language/it/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Latvian (http://www.transifex.com/rosarior/mayan-edms/language/lv/)\n"
|
||||
|
||||
@@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Dutch (Netherlands) (http://www.transifex.com/rosarior/mayan-edms/language/nl_NL/)\n"
|
||||
|
||||
@@ -10,7 +10,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Polish (http://www.transifex.com/rosarior/mayan-edms/language/pl/)\n"
|
||||
|
||||
@@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Portuguese (http://www.transifex.com/rosarior/mayan-edms/language/pt/)\n"
|
||||
|
||||
@@ -10,7 +10,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/rosarior/mayan-edms/language/pt_BR/)\n"
|
||||
|
||||
Binary file not shown.
@@ -9,9 +9,9 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-10-29 12:28+0000\n"
|
||||
"Last-Translator: Harald Ersch\n"
|
||||
"Language-Team: Romanian (Romania) (http://www.transifex.com/rosarior/mayan-edms/language/ro_RO/)\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
@@ -932,7 +932,7 @@ msgstr "Numărul total de pagini de documente din fiecare lună"
|
||||
|
||||
#: templates/documents/document_print.html:12
|
||||
msgid "Document page image preview"
|
||||
msgstr ""
|
||||
msgstr "Previzualizare imagine pagină document"
|
||||
|
||||
#: templates/documents/forms/widgets/document_page_carousel.html:16
|
||||
#, python-format
|
||||
@@ -948,7 +948,7 @@ msgstr "Nu există pagini de afișat"
|
||||
|
||||
#: templates/documents/forms/widgets/document_page_image.html:13
|
||||
msgid "Document image"
|
||||
msgstr ""
|
||||
msgstr "Imaginea documentului"
|
||||
|
||||
#: utils.py:18
|
||||
#, python-format
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Russian (http://www.transifex.com/rosarior/mayan-edms/language/ru/)\n"
|
||||
|
||||
@@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/rosarior/mayan-edms/language/sl_SI/)\n"
|
||||
|
||||
@@ -9,7 +9,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Turkish (Turkey) (http://www.transifex.com/rosarior/mayan-edms/language/tr_TR/)\n"
|
||||
|
||||
@@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Vietnamese (Viet Nam) (http://www.transifex.com/rosarior/mayan-edms/language/vi_VN/)\n"
|
||||
|
||||
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Mayan EDMS\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-10-27 14:58-0400\n"
|
||||
"POT-Creation-Date: 2019-10-30 03:00-0400\n"
|
||||
"PO-Revision-Date: 2019-09-24 04:46+0000\n"
|
||||
"Last-Translator: Roberto Rosario\n"
|
||||
"Language-Team: Chinese (http://www.transifex.com/rosarior/mayan-edms/language/zh/)\n"
|
||||
|
||||
@@ -133,7 +133,7 @@ class DuplicatedDocumentManager(models.Manager):
|
||||
app_label='documents', model_name='Document'
|
||||
)
|
||||
return Document.objects.filter(
|
||||
pk__in=self.filter(documents__isnull=False).values_list(
|
||||
pk__in=self.filter(documents__in_trash=False).values_list(
|
||||
'document_id', flat=True
|
||||
)
|
||||
)
|
||||
|
||||
@@ -6,22 +6,67 @@ from .base import GenericDocumentViewTestCase
|
||||
|
||||
|
||||
class DuplicatedDocumentsViewsTestMixin(object):
|
||||
def _upload_duplicate_document(self):
|
||||
self.upload_document()
|
||||
|
||||
def _request_duplicated_document_list_view(self):
|
||||
return self.get(viewname='documents:duplicated_document_list')
|
||||
|
||||
def _request_document_duplicates_list_view(self):
|
||||
return self.get(
|
||||
viewname='documents:document_duplicates_list',
|
||||
kwargs={'pk': self.test_documents[0].pk}
|
||||
)
|
||||
|
||||
def _request_duplicated_document_list_view(self):
|
||||
return self.get(viewname='documents:duplicated_document_list')
|
||||
|
||||
def _upload_duplicate_document(self):
|
||||
self.upload_document()
|
||||
|
||||
|
||||
class DuplicatedDocumentsViewsTestCase(
|
||||
DuplicatedDocumentsViewsTestMixin, GenericDocumentViewTestCase
|
||||
):
|
||||
def test_document_duplicates_list_no_permissions(self):
|
||||
self._upload_duplicate_document()
|
||||
|
||||
response = self._request_document_duplicates_list_view()
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_document_duplicates_list_with_access(self):
|
||||
self._upload_duplicate_document()
|
||||
self.grant_access(
|
||||
obj=self.test_documents[0],
|
||||
permission=permission_document_view
|
||||
)
|
||||
self.grant_access(
|
||||
obj=self.test_documents[1],
|
||||
permission=permission_document_view
|
||||
)
|
||||
|
||||
response = self._request_document_duplicates_list_view()
|
||||
self.assertContains(
|
||||
response=response, text=self.test_documents[0].label,
|
||||
status_code=200
|
||||
)
|
||||
|
||||
def test_document_trashed_duplicates_list_with_full_access(self):
|
||||
self._upload_duplicate_document()
|
||||
self.grant_access(
|
||||
obj=self.test_documents[0],
|
||||
permission=permission_document_view
|
||||
)
|
||||
self.grant_access(
|
||||
obj=self.test_documents[1],
|
||||
permission=permission_document_view
|
||||
)
|
||||
self.test_documents[1].delete()
|
||||
|
||||
response = self._request_document_duplicates_list_view()
|
||||
self.assertContains(
|
||||
response=response, text=self.test_documents[0].pk,
|
||||
status_code=200
|
||||
)
|
||||
self.assertNotContains(
|
||||
response=response, text=self.test_documents[1].pk,
|
||||
status_code=200
|
||||
)
|
||||
|
||||
def test_duplicated_document_list_no_permissions(self):
|
||||
self._upload_duplicate_document()
|
||||
|
||||
@@ -48,13 +93,7 @@ class DuplicatedDocumentsViewsTestCase(
|
||||
status_code=200
|
||||
)
|
||||
|
||||
def test_document_duplicates_list_no_permissions(self):
|
||||
self._upload_duplicate_document()
|
||||
|
||||
response = self._request_document_duplicates_list_view()
|
||||
self.assertEqual(response.status_code, 403)
|
||||
|
||||
def test_document_duplicates_list_with_access(self):
|
||||
def test_duplicated_trashed_document_list_with_access(self):
|
||||
self._upload_duplicate_document()
|
||||
self.grant_access(
|
||||
obj=self.test_documents[0],
|
||||
@@ -64,9 +103,14 @@ class DuplicatedDocumentsViewsTestCase(
|
||||
obj=self.test_documents[1],
|
||||
permission=permission_document_view
|
||||
)
|
||||
self.test_documents[1].delete()
|
||||
|
||||
response = self._request_document_duplicates_list_view()
|
||||
self.assertContains(
|
||||
response=response, text=self.test_documents[0].label,
|
||||
response = self._request_duplicated_document_list_view()
|
||||
self.assertNotContains(
|
||||
response=response, text=self.test_documents[0].pk,
|
||||
status_code=200
|
||||
)
|
||||
self.assertNotContains(
|
||||
response=response, text=self.test_documents[1].pk,
|
||||
status_code=200
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user