From fc9d7b1a8be4e0c6c7cdea0a3d748251187fc1c5 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Wed, 15 Jul 2015 01:03:23 -0400 Subject: [PATCH] Remove celery code execute from model. Allow for default at the model level. --- mayan/apps/documents/literals.py | 1 + .../migrations/0018_auto_20150714_2227.py | 32 ++++++++++ .../migrations/0019_auto_20150714_2232.py | 20 +++++++ .../migrations/0020_auto_20150714_2233.py | 32 ++++++++++ .../migrations/0021_auto_20150714_2238.py | 20 +++++++ .../migrations/0022_auto_20150715_0258.py | 20 +++++++ .../migrations/0023_auto_20150715_0259.py | 26 +++++++++ mayan/apps/documents/models.py | 58 ++++++++----------- mayan/apps/documents/tasks.py | 55 +++++++++++++----- mayan/apps/documents/test_models.py | 2 +- mayan/apps/documents/test_views.py | 2 +- 11 files changed, 215 insertions(+), 53 deletions(-) create mode 100644 mayan/apps/documents/migrations/0018_auto_20150714_2227.py create mode 100644 mayan/apps/documents/migrations/0019_auto_20150714_2232.py create mode 100644 mayan/apps/documents/migrations/0020_auto_20150714_2233.py create mode 100644 mayan/apps/documents/migrations/0021_auto_20150714_2238.py create mode 100644 mayan/apps/documents/migrations/0022_auto_20150715_0258.py create mode 100644 mayan/apps/documents/migrations/0023_auto_20150715_0259.py diff --git a/mayan/apps/documents/literals.py b/mayan/apps/documents/literals.py index 2e9b5ed480..4c740ea414 100644 --- a/mayan/apps/documents/literals.py +++ b/mayan/apps/documents/literals.py @@ -9,3 +9,4 @@ DEFAULT_ZIP_FILENAME = 'document_bundle.zip' DOCUMENT_IMAGE_TASK_TIMEOUT = 20 UPDATE_PAGE_COUNT_RETRY_DELAY = 10 UPLOAD_NEW_VERSION_RETRY_DELAY = 10 +NEW_DOCUMENT_RETRY_DELAY = 10 diff --git a/mayan/apps/documents/migrations/0018_auto_20150714_2227.py b/mayan/apps/documents/migrations/0018_auto_20150714_2227.py new file mode 100644 index 0000000000..057a017d63 --- /dev/null +++ b/mayan/apps/documents/migrations/0018_auto_20150714_2227.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '0017_auto_20150714_0056'), + ] + + operations = [ + migrations.AlterField( + model_name='document', + name='description', + field=models.TextField(default='', verbose_name='Description', blank=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='document', + name='label', + field=models.CharField(default='', max_length=255, blank=True, help_text='The name of the document', verbose_name='Label', db_index=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='documentversion', + name='comment', + field=models.TextField(default='', verbose_name='Comment', blank=True), + preserve_default=True, + ), + ] diff --git a/mayan/apps/documents/migrations/0019_auto_20150714_2232.py b/mayan/apps/documents/migrations/0019_auto_20150714_2232.py new file mode 100644 index 0000000000..ea985c441c --- /dev/null +++ b/mayan/apps/documents/migrations/0019_auto_20150714_2232.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '0018_auto_20150714_2227'), + ] + + operations = [ + migrations.AlterField( + model_name='document', + name='language', + field=models.CharField(default=b'eng', max_length=8, verbose_name='Language', blank=True, choices=[[b'aar', b'Afar'], [b'abk', b'Abkhazian'], [b'ace', b'Achinese'], [b'ach', b'Acoli'], [b'ada', b'Adangme'], [b'ady', b'Adyghe; Adygei'], [b'afa', b'Afro-Asiatic languages'], [b'afh', b'Afrihili'], [b'afr', b'Afrikaans'], [b'ain', b'Ainu'], [b'aka', b'Akan'], [b'akk', b'Akkadian'], [b'alb', b'Albanian'], [b'ale', b'Aleut'], [b'alg', b'Algonquian languages'], [b'alt', b'Southern Altai'], [b'amh', b'Amharic'], [b'ang', b'English, Old (ca. 450-1100)'], [b'anp', b'Angika'], [b'apa', b'Apache languages'], [b'ara', b'Arabic'], [b'arc', b'Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)'], [b'arg', b'Aragonese'], [b'arm', b'Armenian'], [b'arn', b'Mapudungun; Mapuche'], [b'arp', b'Arapaho'], [b'art', b'Artificial languages'], [b'arw', b'Arawak'], [b'asm', b'Assamese'], [b'ast', b'Asturian; Bable; Leonese; Asturleonese'], [b'ath', b'Athapascan languages'], [b'aus', b'Australian languages'], [b'ava', b'Avaric'], [b'ave', b'Avestan'], [b'awa', b'Awadhi'], [b'aym', b'Aymara'], [b'aze', b'Azerbaijani'], [b'bad', b'Banda languages'], [b'bai', b'Bamileke languages'], [b'bak', b'Bashkir'], [b'bal', b'Baluchi'], [b'bam', b'Bambara'], [b'ban', b'Balinese'], [b'baq', b'Basque'], [b'bas', b'Basa'], [b'bat', b'Baltic languages'], [b'bej', b'Beja; Bedawiyet'], [b'bel', b'Belarusian'], [b'bem', b'Bemba'], [b'ben', b'Bengali'], [b'ber', b'Berber languages'], [b'bho', b'Bhojpuri'], [b'bih', b'Bihari languages'], [b'bik', b'Bikol'], [b'bin', b'Bini; Edo'], [b'bis', b'Bislama'], [b'bla', b'Siksika'], [b'bnt', b'Bantu languages'], [b'bos', b'Bosnian'], [b'bra', b'Braj'], [b'bre', b'Breton'], [b'btk', b'Batak languages'], [b'bua', b'Buriat'], [b'bug', b'Buginese'], [b'bul', b'Bulgarian'], [b'bur', b'Burmese'], [b'byn', b'Blin; Bilin'], [b'cad', b'Caddo'], [b'cai', b'Central American Indian languages'], [b'car', b'Galibi Carib'], [b'cat', b'Catalan; Valencian'], [b'cau', b'Caucasian languages'], [b'ceb', b'Cebuano'], [b'cel', b'Celtic languages'], [b'cha', b'Chamorro'], [b'chb', b'Chibcha'], [b'che', b'Chechen'], [b'chg', b'Chagatai'], [b'chi', b'Chinese'], [b'chk', b'Chuukese'], [b'chm', b'Mari'], [b'chn', b'Chinook jargon'], [b'cho', b'Choctaw'], [b'chp', b'Chipewyan; Dene Suline'], [b'chr', b'Cherokee'], [b'chu', b'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic'], [b'chv', b'Chuvash'], [b'chy', b'Cheyenne'], [b'cmc', b'Chamic languages'], [b'cop', b'Coptic'], [b'cor', b'Cornish'], [b'cos', b'Corsican'], [b'cpe', b'Creoles and pidgins, English based'], [b'cpf', b'Creoles and pidgins, French-based'], [b'cpp', b'Creoles and pidgins, Portuguese-based'], [b'cre', b'Cree'], [b'crh', b'Crimean Tatar; Crimean Turkish'], [b'crp', b'Creoles and pidgins'], [b'csb', b'Kashubian'], [b'cus', b'Cushitic languages'], [b'cze', b'Czech'], [b'dak', b'Dakota'], [b'dan', b'Danish'], [b'dar', b'Dargwa'], [b'day', b'Land Dayak languages'], [b'del', b'Delaware'], [b'den', b'Slave (Athapascan)'], [b'dgr', b'Dogrib'], [b'din', b'Dinka'], [b'div', b'Divehi; Dhivehi; Maldivian'], [b'doi', b'Dogri'], [b'dra', b'Dravidian languages'], [b'dsb', b'Lower Sorbian'], [b'dua', b'Duala'], [b'dum', b'Dutch, Middle (ca. 1050-1350)'], [b'dut', b'Dutch; Flemish'], [b'dyu', b'Dyula'], [b'dzo', b'Dzongkha'], [b'efi', b'Efik'], [b'egy', b'Egyptian (Ancient)'], [b'eka', b'Ekajuk'], [b'elx', b'Elamite'], [b'eng', b'English'], [b'enm', b'English, Middle (1100-1500)'], [b'epo', b'Esperanto'], [b'est', b'Estonian'], [b'ewe', b'Ewe'], [b'ewo', b'Ewondo'], [b'fan', b'Fang'], [b'fao', b'Faroese'], [b'fat', b'Fanti'], [b'fij', b'Fijian'], [b'fil', b'Filipino; Pilipino'], [b'fin', b'Finnish'], [b'fiu', b'Finno-Ugrian languages'], [b'fon', b'Fon'], [b'fre', b'French'], [b'frm', b'French, Middle (ca. 1400-1600)'], [b'fro', b'French, Old (842-ca. 1400)'], [b'frr', b'Northern Frisian'], [b'frs', b'Eastern Frisian'], [b'fry', b'Western Frisian'], [b'ful', b'Fulah'], [b'fur', b'Friulian'], [b'gaa', b'Ga'], [b'gay', b'Gayo'], [b'gba', b'Gbaya'], [b'gem', b'Germanic languages'], [b'geo', b'Georgian'], [b'ger', b'German'], [b'gez', b'Geez'], [b'gil', b'Gilbertese'], [b'gla', b'Gaelic; Scottish Gaelic'], [b'gle', b'Irish'], [b'glg', b'Galician'], [b'glv', b'Manx'], [b'gmh', b'German, Middle High (ca. 1050-1500)'], [b'goh', b'German, Old High (ca. 750-1050)'], [b'gon', b'Gondi'], [b'gor', b'Gorontalo'], [b'got', b'Gothic'], [b'grb', b'Grebo'], [b'grc', b'Greek, Ancient (to 1453)'], [b'gre', b'Greek, Modern (1453-)'], [b'grn', b'Guarani'], [b'gsw', b'Swiss German; Alemannic; Alsatian'], [b'guj', b'Gujarati'], [b'gwi', b"Gwich'in"], [b'hai', b'Haida'], [b'hat', b'Haitian; Haitian Creole'], [b'hau', b'Hausa'], [b'haw', b'Hawaiian'], [b'heb', b'Hebrew'], [b'her', b'Herero'], [b'hil', b'Hiligaynon'], [b'him', b'Himachali languages; Western Pahari languages'], [b'hin', b'Hindi'], [b'hit', b'Hittite'], [b'hmn', b'Hmong; Mong'], [b'hmo', b'Hiri Motu'], [b'hrv', b'Croatian'], [b'hsb', b'Upper Sorbian'], [b'hun', b'Hungarian'], [b'hup', b'Hupa'], [b'iba', b'Iban'], [b'ibo', b'Igbo'], [b'ice', b'Icelandic'], [b'ido', b'Ido'], [b'iii', b'Sichuan Yi; Nuosu'], [b'ijo', b'Ijo languages'], [b'iku', b'Inuktitut'], [b'ile', b'Interlingue; Occidental'], [b'ilo', b'Iloko'], [b'ina', b'Interlingua (International Auxiliary Language Association)'], [b'inc', b'Indic languages'], [b'ind', b'Indonesian'], [b'ine', b'Indo-European languages'], [b'inh', b'Ingush'], [b'ipk', b'Inupiaq'], [b'ira', b'Iranian languages'], [b'iro', b'Iroquoian languages'], [b'ita', b'Italian'], [b'jav', b'Javanese'], [b'jbo', b'Lojban'], [b'jpn', b'Japanese'], [b'jpr', b'Judeo-Persian'], [b'jrb', b'Judeo-Arabic'], [b'kaa', b'Kara-Kalpak'], [b'kab', b'Kabyle'], [b'kac', b'Kachin; Jingpho'], [b'kal', b'Kalaallisut; Greenlandic'], [b'kam', b'Kamba'], [b'kan', b'Kannada'], [b'kar', b'Karen languages'], [b'kas', b'Kashmiri'], [b'kau', b'Kanuri'], [b'kaw', b'Kawi'], [b'kaz', b'Kazakh'], [b'kbd', b'Kabardian'], [b'kha', b'Khasi'], [b'khi', b'Khoisan languages'], [b'khm', b'Central Khmer'], [b'kho', b'Khotanese;Sakan'], [b'kik', b'Kikuyu; Gikuyu'], [b'kin', b'Kinyarwanda'], [b'kir', b'Kirghiz; Kyrgyz'], [b'kmb', b'Kimbundu'], [b'kok', b'Konkani'], [b'kom', b'Komi'], [b'kon', b'Kongo'], [b'kor', b'Korean'], [b'kos', b'Kosraean'], [b'kpe', b'Kpelle'], [b'krc', b'Karachay-Balkar'], [b'krl', b'Karelian'], [b'kro', b'Kru languages'], [b'kru', b'Kurukh'], [b'kua', b'Kuanyama; Kwanyama'], [b'kum', b'Kumyk'], [b'kur', b'Kurdish'], [b'kut', b'Kutenai'], [b'lad', b'Ladino'], [b'lah', b'Lahnda'], [b'lam', b'Lamba'], [b'lao', b'Lao'], [b'lat', b'Latin'], [b'lav', b'Latvian'], [b'lez', b'Lezghian'], [b'lim', b'Limburgan; Limburger; Limburgish'], [b'lin', b'Lingala'], [b'lit', b'Lithuanian'], [b'lol', b'Mongo'], [b'loz', b'Lozi'], [b'ltz', b'Luxembourgish; Letzeburgesch'], [b'lua', b'Luba-Lulua'], [b'lub', b'Luba-Katanga'], [b'lug', b'Ganda'], [b'lui', b'Luiseno'], [b'lun', b'Lunda'], [b'luo', b'Luo (Kenya and Tanzania)'], [b'lus', b'Lushai'], [b'mac', b'Macedonian'], [b'mad', b'Madurese'], [b'mag', b'Magahi'], [b'mah', b'Marshallese'], [b'mai', b'Maithili'], [b'mak', b'Makasar'], [b'mal', b'Malayalam'], [b'man', b'Mandingo'], [b'mao', b'Maori'], [b'map', b'Austronesian languages'], [b'mar', b'Marathi'], [b'mas', b'Masai'], [b'may', b'Malay'], [b'mdf', b'Moksha'], [b'mdr', b'Mandar'], [b'men', b'Mende'], [b'mga', b'Irish, Middle (900-1200)'], [b'mic', b"Mi'kmaq; Micmac"], [b'min', b'Minangkabau'], [b'mis', b'Uncoded languages'], [b'mkh', b'Mon-Khmer languages'], [b'mlg', b'Malagasy'], [b'mlt', b'Maltese'], [b'mnc', b'Manchu'], [b'mni', b'Manipuri'], [b'mno', b'Manobo languages'], [b'moh', b'Mohawk'], [b'mol', b'Moldavian; Moldovan'], [b'mon', b'Mongolian'], [b'mos', b'Mossi'], [b'mul', b'Multiple languages'], [b'mun', b'Munda languages'], [b'mus', b'Creek'], [b'mwl', b'Mirandese'], [b'mwr', b'Marwari'], [b'myn', b'Mayan languages'], [b'myv', b'Erzya'], [b'nah', b'Nahuatl languages'], [b'nai', b'North American Indian languages'], [b'nap', b'Neapolitan'], [b'nau', b'Nauru'], [b'nav', b'Navajo; Navaho'], [b'nbl', b'Ndebele, South; South Ndebele'], [b'nde', b'Ndebele, North; North Ndebele'], [b'ndo', b'Ndonga'], [b'nds', b'Low German; Low Saxon; German, Low; Saxon, Low'], [b'nep', b'Nepali'], [b'new', b'Nepal Bhasa; Newari'], [b'nia', b'Nias'], [b'nic', b'Niger-Kordofanian languages'], [b'niu', b'Niuean'], [b'nno', b'Norwegian Nynorsk; Nynorsk, Norwegian'], [b'nob', 'Bokm\xe5l, Norwegian; Norwegian Bokm\xe5l'], [b'nog', b'Nogai'], [b'non', b'Norse, Old'], [b'nor', b'Norwegian'], [b'nqo', b"N'Ko"], [b'nso', b'Pedi; Sepedi; Northern Sotho'], [b'nub', b'Nubian languages'], [b'nwc', b'Classical Newari; Old Newari; Classical Nepal Bhasa'], [b'nya', b'Chichewa; Chewa; Nyanja'], [b'nym', b'Nyamwezi'], [b'nyn', b'Nyankole'], [b'nyo', b'Nyoro'], [b'nzi', b'Nzima'], [b'oci', b'Occitan (post 1500)'], [b'oji', b'Ojibwa'], [b'ori', b'Oriya'], [b'orm', b'Oromo'], [b'osa', b'Osage'], [b'oss', b'Ossetian; Ossetic'], [b'ota', b'Turkish, Ottoman (1500-1928)'], [b'oto', b'Otomian languages'], [b'paa', b'Papuan languages'], [b'pag', b'Pangasinan'], [b'pal', b'Pahlavi'], [b'pam', b'Pampanga; Kapampangan'], [b'pan', b'Panjabi; Punjabi'], [b'pap', b'Papiamento'], [b'pau', b'Palauan'], [b'peo', b'Persian, Old (ca. 600-400 B.C.)'], [b'per', b'Persian'], [b'phi', b'Philippine languages'], [b'phn', b'Phoenician'], [b'pli', b'Pali'], [b'pol', b'Polish'], [b'pon', b'Pohnpeian'], [b'por', b'Portuguese'], [b'pra', b'Prakrit languages'], [b'pro', 'Proven\xe7al, Old (to 1500); Occitan, Old (to 1500)'], [b'pus', b'Pushto; Pashto'], [b'qaa-qtz', b'Reserved for local use'], [b'que', b'Quechua'], [b'raj', b'Rajasthani'], [b'rap', b'Rapanui'], [b'rar', b'Rarotongan; Cook Islands Maori'], [b'roa', b'Romance languages'], [b'roh', b'Romansh'], [b'rom', b'Romany'], [b'rum', b'Romanian'], [b'run', b'Rundi'], [b'rup', b'Aromanian; Arumanian; Macedo-Romanian'], [b'rus', b'Russian'], [b'sad', b'Sandawe'], [b'sag', b'Sango'], [b'sah', b'Yakut'], [b'sai', b'South American Indian languages'], [b'sal', b'Salishan languages'], [b'sam', b'Samaritan Aramaic'], [b'san', b'Sanskrit'], [b'sas', b'Sasak'], [b'sat', b'Santali'], [b'scn', b'Sicilian'], [b'sco', b'Scots'], [b'sel', b'Selkup'], [b'sem', b'Semitic languages'], [b'sga', b'Irish, Old (to 900)'], [b'sgn', b'Sign Languages'], [b'shn', b'Shan'], [b'sid', b'Sidamo'], [b'sin', b'Sinhala; Sinhalese'], [b'sio', b'Siouan languages'], [b'sit', b'Sino-Tibetan languages'], [b'sla', b'Slavic languages'], [b'slo', b'Slovak'], [b'slv', b'Slovenian'], [b'sma', b'Southern Sami'], [b'sme', b'Northern Sami'], [b'smi', b'Sami languages'], [b'smj', b'Lule Sami'], [b'smn', b'Inari Sami'], [b'smo', b'Samoan'], [b'sms', b'Skolt Sami'], [b'sna', b'Shona'], [b'snd', b'Sindhi'], [b'snk', b'Soninke'], [b'sog', b'Sogdian'], [b'som', b'Somali'], [b'son', b'Songhai languages'], [b'sot', b'Sotho, Southern'], [b'spa', b'Spanish; Castilian'], [b'srd', b'Sardinian'], [b'srn', b'Sranan Tongo'], [b'srp', b'Serbian'], [b'srr', b'Serer'], [b'ssa', b'Nilo-Saharan languages'], [b'ssw', b'Swati'], [b'suk', b'Sukuma'], [b'sun', b'Sundanese'], [b'sus', b'Susu'], [b'sux', b'Sumerian'], [b'swa', b'Swahili'], [b'swe', b'Swedish'], [b'syc', b'Classical Syriac'], [b'syr', b'Syriac'], [b'tah', b'Tahitian'], [b'tai', b'Tai languages'], [b'tam', b'Tamil'], [b'tat', b'Tatar'], [b'tel', b'Telugu'], [b'tem', b'Timne'], [b'ter', b'Tereno'], [b'tet', b'Tetum'], [b'tgk', b'Tajik'], [b'tgl', b'Tagalog'], [b'tha', b'Thai'], [b'tib', b'Tibetan'], [b'tig', b'Tigre'], [b'tir', b'Tigrinya'], [b'tiv', b'Tiv'], [b'tkl', b'Tokelau'], [b'tlh', b'Klingon; tlhIngan-Hol'], [b'tli', b'Tlingit'], [b'tmh', b'Tamashek'], [b'tog', b'Tonga (Nyasa)'], [b'ton', b'Tonga (Tonga Islands)'], [b'tpi', b'Tok Pisin'], [b'tsi', b'Tsimshian'], [b'tsn', b'Tswana'], [b'tso', b'Tsonga'], [b'tuk', b'Turkmen'], [b'tum', b'Tumbuka'], [b'tup', b'Tupi languages'], [b'tur', b'Turkish'], [b'tut', b'Altaic languages'], [b'tvl', b'Tuvalu'], [b'twi', b'Twi'], [b'tyv', b'Tuvinian'], [b'udm', b'Udmurt'], [b'uga', b'Ugaritic'], [b'uig', b'Uighur; Uyghur'], [b'ukr', b'Ukrainian'], [b'umb', b'Umbundu'], [b'und', b'Undetermined'], [b'urd', b'Urdu'], [b'uzb', b'Uzbek'], [b'vai', b'Vai'], [b'ven', b'Venda'], [b'vie', b'Vietnamese'], [b'vol', 'Volap\xfck'], [b'vot', b'Votic'], [b'wak', b'Wakashan languages'], [b'wal', b'Wolaitta; Wolaytta'], [b'war', b'Waray'], [b'was', b'Washo'], [b'wel', b'Welsh'], [b'wen', b'Sorbian languages'], [b'wln', b'Walloon'], [b'wol', b'Wolof'], [b'xal', b'Kalmyk; Oirat'], [b'xho', b'Xhosa'], [b'yao', b'Yao'], [b'yap', b'Yapese'], [b'yid', b'Yiddish'], [b'yor', b'Yoruba'], [b'ypk', b'Yupik languages'], [b'zap', b'Zapotec'], [b'zbl', b'Blissymbols; Blissymbolics; Bliss'], [b'zen', b'Zenaga'], [b'zgh', b'Standard Moroccan Tamazight'], [b'zha', b'Zhuang; Chuang'], [b'znd', b'Zande languages'], [b'zul', b'Zulu'], [b'zun', b'Zuni'], [b'zxx', b'No linguistic content; Not applicable'], [b'zza', b'Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki']]), + preserve_default=True, + ), + ] diff --git a/mayan/apps/documents/migrations/0020_auto_20150714_2233.py b/mayan/apps/documents/migrations/0020_auto_20150714_2233.py new file mode 100644 index 0000000000..98989cc026 --- /dev/null +++ b/mayan/apps/documents/migrations/0020_auto_20150714_2233.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '0019_auto_20150714_2232'), + ] + + operations = [ + migrations.AlterField( + model_name='document', + name='description', + field=models.TextField(default='', null=True, verbose_name='Description', blank=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='document', + name='label', + field=models.CharField(default='', max_length=255, blank=True, help_text='The name of the document', null=True, verbose_name='Label', db_index=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='document', + name='language', + field=models.CharField(default=b'eng', choices=[[b'aar', b'Afar'], [b'abk', b'Abkhazian'], [b'ace', b'Achinese'], [b'ach', b'Acoli'], [b'ada', b'Adangme'], [b'ady', b'Adyghe; Adygei'], [b'afa', b'Afro-Asiatic languages'], [b'afh', b'Afrihili'], [b'afr', b'Afrikaans'], [b'ain', b'Ainu'], [b'aka', b'Akan'], [b'akk', b'Akkadian'], [b'alb', b'Albanian'], [b'ale', b'Aleut'], [b'alg', b'Algonquian languages'], [b'alt', b'Southern Altai'], [b'amh', b'Amharic'], [b'ang', b'English, Old (ca. 450-1100)'], [b'anp', b'Angika'], [b'apa', b'Apache languages'], [b'ara', b'Arabic'], [b'arc', b'Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)'], [b'arg', b'Aragonese'], [b'arm', b'Armenian'], [b'arn', b'Mapudungun; Mapuche'], [b'arp', b'Arapaho'], [b'art', b'Artificial languages'], [b'arw', b'Arawak'], [b'asm', b'Assamese'], [b'ast', b'Asturian; Bable; Leonese; Asturleonese'], [b'ath', b'Athapascan languages'], [b'aus', b'Australian languages'], [b'ava', b'Avaric'], [b'ave', b'Avestan'], [b'awa', b'Awadhi'], [b'aym', b'Aymara'], [b'aze', b'Azerbaijani'], [b'bad', b'Banda languages'], [b'bai', b'Bamileke languages'], [b'bak', b'Bashkir'], [b'bal', b'Baluchi'], [b'bam', b'Bambara'], [b'ban', b'Balinese'], [b'baq', b'Basque'], [b'bas', b'Basa'], [b'bat', b'Baltic languages'], [b'bej', b'Beja; Bedawiyet'], [b'bel', b'Belarusian'], [b'bem', b'Bemba'], [b'ben', b'Bengali'], [b'ber', b'Berber languages'], [b'bho', b'Bhojpuri'], [b'bih', b'Bihari languages'], [b'bik', b'Bikol'], [b'bin', b'Bini; Edo'], [b'bis', b'Bislama'], [b'bla', b'Siksika'], [b'bnt', b'Bantu languages'], [b'bos', b'Bosnian'], [b'bra', b'Braj'], [b'bre', b'Breton'], [b'btk', b'Batak languages'], [b'bua', b'Buriat'], [b'bug', b'Buginese'], [b'bul', b'Bulgarian'], [b'bur', b'Burmese'], [b'byn', b'Blin; Bilin'], [b'cad', b'Caddo'], [b'cai', b'Central American Indian languages'], [b'car', b'Galibi Carib'], [b'cat', b'Catalan; Valencian'], [b'cau', b'Caucasian languages'], [b'ceb', b'Cebuano'], [b'cel', b'Celtic languages'], [b'cha', b'Chamorro'], [b'chb', b'Chibcha'], [b'che', b'Chechen'], [b'chg', b'Chagatai'], [b'chi', b'Chinese'], [b'chk', b'Chuukese'], [b'chm', b'Mari'], [b'chn', b'Chinook jargon'], [b'cho', b'Choctaw'], [b'chp', b'Chipewyan; Dene Suline'], [b'chr', b'Cherokee'], [b'chu', b'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic'], [b'chv', b'Chuvash'], [b'chy', b'Cheyenne'], [b'cmc', b'Chamic languages'], [b'cop', b'Coptic'], [b'cor', b'Cornish'], [b'cos', b'Corsican'], [b'cpe', b'Creoles and pidgins, English based'], [b'cpf', b'Creoles and pidgins, French-based'], [b'cpp', b'Creoles and pidgins, Portuguese-based'], [b'cre', b'Cree'], [b'crh', b'Crimean Tatar; Crimean Turkish'], [b'crp', b'Creoles and pidgins'], [b'csb', b'Kashubian'], [b'cus', b'Cushitic languages'], [b'cze', b'Czech'], [b'dak', b'Dakota'], [b'dan', b'Danish'], [b'dar', b'Dargwa'], [b'day', b'Land Dayak languages'], [b'del', b'Delaware'], [b'den', b'Slave (Athapascan)'], [b'dgr', b'Dogrib'], [b'din', b'Dinka'], [b'div', b'Divehi; Dhivehi; Maldivian'], [b'doi', b'Dogri'], [b'dra', b'Dravidian languages'], [b'dsb', b'Lower Sorbian'], [b'dua', b'Duala'], [b'dum', b'Dutch, Middle (ca. 1050-1350)'], [b'dut', b'Dutch; Flemish'], [b'dyu', b'Dyula'], [b'dzo', b'Dzongkha'], [b'efi', b'Efik'], [b'egy', b'Egyptian (Ancient)'], [b'eka', b'Ekajuk'], [b'elx', b'Elamite'], [b'eng', b'English'], [b'enm', b'English, Middle (1100-1500)'], [b'epo', b'Esperanto'], [b'est', b'Estonian'], [b'ewe', b'Ewe'], [b'ewo', b'Ewondo'], [b'fan', b'Fang'], [b'fao', b'Faroese'], [b'fat', b'Fanti'], [b'fij', b'Fijian'], [b'fil', b'Filipino; Pilipino'], [b'fin', b'Finnish'], [b'fiu', b'Finno-Ugrian languages'], [b'fon', b'Fon'], [b'fre', b'French'], [b'frm', b'French, Middle (ca. 1400-1600)'], [b'fro', b'French, Old (842-ca. 1400)'], [b'frr', b'Northern Frisian'], [b'frs', b'Eastern Frisian'], [b'fry', b'Western Frisian'], [b'ful', b'Fulah'], [b'fur', b'Friulian'], [b'gaa', b'Ga'], [b'gay', b'Gayo'], [b'gba', b'Gbaya'], [b'gem', b'Germanic languages'], [b'geo', b'Georgian'], [b'ger', b'German'], [b'gez', b'Geez'], [b'gil', b'Gilbertese'], [b'gla', b'Gaelic; Scottish Gaelic'], [b'gle', b'Irish'], [b'glg', b'Galician'], [b'glv', b'Manx'], [b'gmh', b'German, Middle High (ca. 1050-1500)'], [b'goh', b'German, Old High (ca. 750-1050)'], [b'gon', b'Gondi'], [b'gor', b'Gorontalo'], [b'got', b'Gothic'], [b'grb', b'Grebo'], [b'grc', b'Greek, Ancient (to 1453)'], [b'gre', b'Greek, Modern (1453-)'], [b'grn', b'Guarani'], [b'gsw', b'Swiss German; Alemannic; Alsatian'], [b'guj', b'Gujarati'], [b'gwi', b"Gwich'in"], [b'hai', b'Haida'], [b'hat', b'Haitian; Haitian Creole'], [b'hau', b'Hausa'], [b'haw', b'Hawaiian'], [b'heb', b'Hebrew'], [b'her', b'Herero'], [b'hil', b'Hiligaynon'], [b'him', b'Himachali languages; Western Pahari languages'], [b'hin', b'Hindi'], [b'hit', b'Hittite'], [b'hmn', b'Hmong; Mong'], [b'hmo', b'Hiri Motu'], [b'hrv', b'Croatian'], [b'hsb', b'Upper Sorbian'], [b'hun', b'Hungarian'], [b'hup', b'Hupa'], [b'iba', b'Iban'], [b'ibo', b'Igbo'], [b'ice', b'Icelandic'], [b'ido', b'Ido'], [b'iii', b'Sichuan Yi; Nuosu'], [b'ijo', b'Ijo languages'], [b'iku', b'Inuktitut'], [b'ile', b'Interlingue; Occidental'], [b'ilo', b'Iloko'], [b'ina', b'Interlingua (International Auxiliary Language Association)'], [b'inc', b'Indic languages'], [b'ind', b'Indonesian'], [b'ine', b'Indo-European languages'], [b'inh', b'Ingush'], [b'ipk', b'Inupiaq'], [b'ira', b'Iranian languages'], [b'iro', b'Iroquoian languages'], [b'ita', b'Italian'], [b'jav', b'Javanese'], [b'jbo', b'Lojban'], [b'jpn', b'Japanese'], [b'jpr', b'Judeo-Persian'], [b'jrb', b'Judeo-Arabic'], [b'kaa', b'Kara-Kalpak'], [b'kab', b'Kabyle'], [b'kac', b'Kachin; Jingpho'], [b'kal', b'Kalaallisut; Greenlandic'], [b'kam', b'Kamba'], [b'kan', b'Kannada'], [b'kar', b'Karen languages'], [b'kas', b'Kashmiri'], [b'kau', b'Kanuri'], [b'kaw', b'Kawi'], [b'kaz', b'Kazakh'], [b'kbd', b'Kabardian'], [b'kha', b'Khasi'], [b'khi', b'Khoisan languages'], [b'khm', b'Central Khmer'], [b'kho', b'Khotanese;Sakan'], [b'kik', b'Kikuyu; Gikuyu'], [b'kin', b'Kinyarwanda'], [b'kir', b'Kirghiz; Kyrgyz'], [b'kmb', b'Kimbundu'], [b'kok', b'Konkani'], [b'kom', b'Komi'], [b'kon', b'Kongo'], [b'kor', b'Korean'], [b'kos', b'Kosraean'], [b'kpe', b'Kpelle'], [b'krc', b'Karachay-Balkar'], [b'krl', b'Karelian'], [b'kro', b'Kru languages'], [b'kru', b'Kurukh'], [b'kua', b'Kuanyama; Kwanyama'], [b'kum', b'Kumyk'], [b'kur', b'Kurdish'], [b'kut', b'Kutenai'], [b'lad', b'Ladino'], [b'lah', b'Lahnda'], [b'lam', b'Lamba'], [b'lao', b'Lao'], [b'lat', b'Latin'], [b'lav', b'Latvian'], [b'lez', b'Lezghian'], [b'lim', b'Limburgan; Limburger; Limburgish'], [b'lin', b'Lingala'], [b'lit', b'Lithuanian'], [b'lol', b'Mongo'], [b'loz', b'Lozi'], [b'ltz', b'Luxembourgish; Letzeburgesch'], [b'lua', b'Luba-Lulua'], [b'lub', b'Luba-Katanga'], [b'lug', b'Ganda'], [b'lui', b'Luiseno'], [b'lun', b'Lunda'], [b'luo', b'Luo (Kenya and Tanzania)'], [b'lus', b'Lushai'], [b'mac', b'Macedonian'], [b'mad', b'Madurese'], [b'mag', b'Magahi'], [b'mah', b'Marshallese'], [b'mai', b'Maithili'], [b'mak', b'Makasar'], [b'mal', b'Malayalam'], [b'man', b'Mandingo'], [b'mao', b'Maori'], [b'map', b'Austronesian languages'], [b'mar', b'Marathi'], [b'mas', b'Masai'], [b'may', b'Malay'], [b'mdf', b'Moksha'], [b'mdr', b'Mandar'], [b'men', b'Mende'], [b'mga', b'Irish, Middle (900-1200)'], [b'mic', b"Mi'kmaq; Micmac"], [b'min', b'Minangkabau'], [b'mis', b'Uncoded languages'], [b'mkh', b'Mon-Khmer languages'], [b'mlg', b'Malagasy'], [b'mlt', b'Maltese'], [b'mnc', b'Manchu'], [b'mni', b'Manipuri'], [b'mno', b'Manobo languages'], [b'moh', b'Mohawk'], [b'mol', b'Moldavian; Moldovan'], [b'mon', b'Mongolian'], [b'mos', b'Mossi'], [b'mul', b'Multiple languages'], [b'mun', b'Munda languages'], [b'mus', b'Creek'], [b'mwl', b'Mirandese'], [b'mwr', b'Marwari'], [b'myn', b'Mayan languages'], [b'myv', b'Erzya'], [b'nah', b'Nahuatl languages'], [b'nai', b'North American Indian languages'], [b'nap', b'Neapolitan'], [b'nau', b'Nauru'], [b'nav', b'Navajo; Navaho'], [b'nbl', b'Ndebele, South; South Ndebele'], [b'nde', b'Ndebele, North; North Ndebele'], [b'ndo', b'Ndonga'], [b'nds', b'Low German; Low Saxon; German, Low; Saxon, Low'], [b'nep', b'Nepali'], [b'new', b'Nepal Bhasa; Newari'], [b'nia', b'Nias'], [b'nic', b'Niger-Kordofanian languages'], [b'niu', b'Niuean'], [b'nno', b'Norwegian Nynorsk; Nynorsk, Norwegian'], [b'nob', 'Bokm\xe5l, Norwegian; Norwegian Bokm\xe5l'], [b'nog', b'Nogai'], [b'non', b'Norse, Old'], [b'nor', b'Norwegian'], [b'nqo', b"N'Ko"], [b'nso', b'Pedi; Sepedi; Northern Sotho'], [b'nub', b'Nubian languages'], [b'nwc', b'Classical Newari; Old Newari; Classical Nepal Bhasa'], [b'nya', b'Chichewa; Chewa; Nyanja'], [b'nym', b'Nyamwezi'], [b'nyn', b'Nyankole'], [b'nyo', b'Nyoro'], [b'nzi', b'Nzima'], [b'oci', b'Occitan (post 1500)'], [b'oji', b'Ojibwa'], [b'ori', b'Oriya'], [b'orm', b'Oromo'], [b'osa', b'Osage'], [b'oss', b'Ossetian; Ossetic'], [b'ota', b'Turkish, Ottoman (1500-1928)'], [b'oto', b'Otomian languages'], [b'paa', b'Papuan languages'], [b'pag', b'Pangasinan'], [b'pal', b'Pahlavi'], [b'pam', b'Pampanga; Kapampangan'], [b'pan', b'Panjabi; Punjabi'], [b'pap', b'Papiamento'], [b'pau', b'Palauan'], [b'peo', b'Persian, Old (ca. 600-400 B.C.)'], [b'per', b'Persian'], [b'phi', b'Philippine languages'], [b'phn', b'Phoenician'], [b'pli', b'Pali'], [b'pol', b'Polish'], [b'pon', b'Pohnpeian'], [b'por', b'Portuguese'], [b'pra', b'Prakrit languages'], [b'pro', 'Proven\xe7al, Old (to 1500); Occitan, Old (to 1500)'], [b'pus', b'Pushto; Pashto'], [b'qaa-qtz', b'Reserved for local use'], [b'que', b'Quechua'], [b'raj', b'Rajasthani'], [b'rap', b'Rapanui'], [b'rar', b'Rarotongan; Cook Islands Maori'], [b'roa', b'Romance languages'], [b'roh', b'Romansh'], [b'rom', b'Romany'], [b'rum', b'Romanian'], [b'run', b'Rundi'], [b'rup', b'Aromanian; Arumanian; Macedo-Romanian'], [b'rus', b'Russian'], [b'sad', b'Sandawe'], [b'sag', b'Sango'], [b'sah', b'Yakut'], [b'sai', b'South American Indian languages'], [b'sal', b'Salishan languages'], [b'sam', b'Samaritan Aramaic'], [b'san', b'Sanskrit'], [b'sas', b'Sasak'], [b'sat', b'Santali'], [b'scn', b'Sicilian'], [b'sco', b'Scots'], [b'sel', b'Selkup'], [b'sem', b'Semitic languages'], [b'sga', b'Irish, Old (to 900)'], [b'sgn', b'Sign Languages'], [b'shn', b'Shan'], [b'sid', b'Sidamo'], [b'sin', b'Sinhala; Sinhalese'], [b'sio', b'Siouan languages'], [b'sit', b'Sino-Tibetan languages'], [b'sla', b'Slavic languages'], [b'slo', b'Slovak'], [b'slv', b'Slovenian'], [b'sma', b'Southern Sami'], [b'sme', b'Northern Sami'], [b'smi', b'Sami languages'], [b'smj', b'Lule Sami'], [b'smn', b'Inari Sami'], [b'smo', b'Samoan'], [b'sms', b'Skolt Sami'], [b'sna', b'Shona'], [b'snd', b'Sindhi'], [b'snk', b'Soninke'], [b'sog', b'Sogdian'], [b'som', b'Somali'], [b'son', b'Songhai languages'], [b'sot', b'Sotho, Southern'], [b'spa', b'Spanish; Castilian'], [b'srd', b'Sardinian'], [b'srn', b'Sranan Tongo'], [b'srp', b'Serbian'], [b'srr', b'Serer'], [b'ssa', b'Nilo-Saharan languages'], [b'ssw', b'Swati'], [b'suk', b'Sukuma'], [b'sun', b'Sundanese'], [b'sus', b'Susu'], [b'sux', b'Sumerian'], [b'swa', b'Swahili'], [b'swe', b'Swedish'], [b'syc', b'Classical Syriac'], [b'syr', b'Syriac'], [b'tah', b'Tahitian'], [b'tai', b'Tai languages'], [b'tam', b'Tamil'], [b'tat', b'Tatar'], [b'tel', b'Telugu'], [b'tem', b'Timne'], [b'ter', b'Tereno'], [b'tet', b'Tetum'], [b'tgk', b'Tajik'], [b'tgl', b'Tagalog'], [b'tha', b'Thai'], [b'tib', b'Tibetan'], [b'tig', b'Tigre'], [b'tir', b'Tigrinya'], [b'tiv', b'Tiv'], [b'tkl', b'Tokelau'], [b'tlh', b'Klingon; tlhIngan-Hol'], [b'tli', b'Tlingit'], [b'tmh', b'Tamashek'], [b'tog', b'Tonga (Nyasa)'], [b'ton', b'Tonga (Tonga Islands)'], [b'tpi', b'Tok Pisin'], [b'tsi', b'Tsimshian'], [b'tsn', b'Tswana'], [b'tso', b'Tsonga'], [b'tuk', b'Turkmen'], [b'tum', b'Tumbuka'], [b'tup', b'Tupi languages'], [b'tur', b'Turkish'], [b'tut', b'Altaic languages'], [b'tvl', b'Tuvalu'], [b'twi', b'Twi'], [b'tyv', b'Tuvinian'], [b'udm', b'Udmurt'], [b'uga', b'Ugaritic'], [b'uig', b'Uighur; Uyghur'], [b'ukr', b'Ukrainian'], [b'umb', b'Umbundu'], [b'und', b'Undetermined'], [b'urd', b'Urdu'], [b'uzb', b'Uzbek'], [b'vai', b'Vai'], [b'ven', b'Venda'], [b'vie', b'Vietnamese'], [b'vol', 'Volap\xfck'], [b'vot', b'Votic'], [b'wak', b'Wakashan languages'], [b'wal', b'Wolaitta; Wolaytta'], [b'war', b'Waray'], [b'was', b'Washo'], [b'wel', b'Welsh'], [b'wen', b'Sorbian languages'], [b'wln', b'Walloon'], [b'wol', b'Wolof'], [b'xal', b'Kalmyk; Oirat'], [b'xho', b'Xhosa'], [b'yao', b'Yao'], [b'yap', b'Yapese'], [b'yid', b'Yiddish'], [b'yor', b'Yoruba'], [b'ypk', b'Yupik languages'], [b'zap', b'Zapotec'], [b'zbl', b'Blissymbols; Blissymbolics; Bliss'], [b'zen', b'Zenaga'], [b'zgh', b'Standard Moroccan Tamazight'], [b'zha', b'Zhuang; Chuang'], [b'znd', b'Zande languages'], [b'zul', b'Zulu'], [b'zun', b'Zuni'], [b'zxx', b'No linguistic content; Not applicable'], [b'zza', b'Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki']], max_length=8, blank=True, null=True, verbose_name='Language'), + preserve_default=True, + ), + ] diff --git a/mayan/apps/documents/migrations/0021_auto_20150714_2238.py b/mayan/apps/documents/migrations/0021_auto_20150714_2238.py new file mode 100644 index 0000000000..e5eb6c253a --- /dev/null +++ b/mayan/apps/documents/migrations/0021_auto_20150714_2238.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '0020_auto_20150714_2233'), + ] + + operations = [ + migrations.AlterField( + model_name='documentversion', + name='comment', + field=models.TextField(default='', null=True, verbose_name='Comment', blank=True), + preserve_default=True, + ), + ] diff --git a/mayan/apps/documents/migrations/0022_auto_20150715_0258.py b/mayan/apps/documents/migrations/0022_auto_20150715_0258.py new file mode 100644 index 0000000000..d27ef37eb4 --- /dev/null +++ b/mayan/apps/documents/migrations/0022_auto_20150715_0258.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '0021_auto_20150714_2238'), + ] + + operations = [ + migrations.AlterField( + model_name='document', + name='description', + field=models.TextField(default='', verbose_name='Description', blank=True), + preserve_default=True, + ), + ] diff --git a/mayan/apps/documents/migrations/0023_auto_20150715_0259.py b/mayan/apps/documents/migrations/0023_auto_20150715_0259.py new file mode 100644 index 0000000000..b0f67a78ef --- /dev/null +++ b/mayan/apps/documents/migrations/0023_auto_20150715_0259.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('documents', '0022_auto_20150715_0258'), + ] + + operations = [ + migrations.AlterField( + model_name='document', + name='label', + field=models.CharField(default='', max_length=255, blank=True, help_text='The name of the document', verbose_name='Label', db_index=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='document', + name='language', + field=models.CharField(default=b'eng', max_length=8, verbose_name='Language', blank=True, choices=[[b'aar', b'Afar'], [b'abk', b'Abkhazian'], [b'ace', b'Achinese'], [b'ach', b'Acoli'], [b'ada', b'Adangme'], [b'ady', b'Adyghe; Adygei'], [b'afa', b'Afro-Asiatic languages'], [b'afh', b'Afrihili'], [b'afr', b'Afrikaans'], [b'ain', b'Ainu'], [b'aka', b'Akan'], [b'akk', b'Akkadian'], [b'alb', b'Albanian'], [b'ale', b'Aleut'], [b'alg', b'Algonquian languages'], [b'alt', b'Southern Altai'], [b'amh', b'Amharic'], [b'ang', b'English, Old (ca. 450-1100)'], [b'anp', b'Angika'], [b'apa', b'Apache languages'], [b'ara', b'Arabic'], [b'arc', b'Official Aramaic (700-300 BCE); Imperial Aramaic (700-300 BCE)'], [b'arg', b'Aragonese'], [b'arm', b'Armenian'], [b'arn', b'Mapudungun; Mapuche'], [b'arp', b'Arapaho'], [b'art', b'Artificial languages'], [b'arw', b'Arawak'], [b'asm', b'Assamese'], [b'ast', b'Asturian; Bable; Leonese; Asturleonese'], [b'ath', b'Athapascan languages'], [b'aus', b'Australian languages'], [b'ava', b'Avaric'], [b'ave', b'Avestan'], [b'awa', b'Awadhi'], [b'aym', b'Aymara'], [b'aze', b'Azerbaijani'], [b'bad', b'Banda languages'], [b'bai', b'Bamileke languages'], [b'bak', b'Bashkir'], [b'bal', b'Baluchi'], [b'bam', b'Bambara'], [b'ban', b'Balinese'], [b'baq', b'Basque'], [b'bas', b'Basa'], [b'bat', b'Baltic languages'], [b'bej', b'Beja; Bedawiyet'], [b'bel', b'Belarusian'], [b'bem', b'Bemba'], [b'ben', b'Bengali'], [b'ber', b'Berber languages'], [b'bho', b'Bhojpuri'], [b'bih', b'Bihari languages'], [b'bik', b'Bikol'], [b'bin', b'Bini; Edo'], [b'bis', b'Bislama'], [b'bla', b'Siksika'], [b'bnt', b'Bantu languages'], [b'bos', b'Bosnian'], [b'bra', b'Braj'], [b'bre', b'Breton'], [b'btk', b'Batak languages'], [b'bua', b'Buriat'], [b'bug', b'Buginese'], [b'bul', b'Bulgarian'], [b'bur', b'Burmese'], [b'byn', b'Blin; Bilin'], [b'cad', b'Caddo'], [b'cai', b'Central American Indian languages'], [b'car', b'Galibi Carib'], [b'cat', b'Catalan; Valencian'], [b'cau', b'Caucasian languages'], [b'ceb', b'Cebuano'], [b'cel', b'Celtic languages'], [b'cha', b'Chamorro'], [b'chb', b'Chibcha'], [b'che', b'Chechen'], [b'chg', b'Chagatai'], [b'chi', b'Chinese'], [b'chk', b'Chuukese'], [b'chm', b'Mari'], [b'chn', b'Chinook jargon'], [b'cho', b'Choctaw'], [b'chp', b'Chipewyan; Dene Suline'], [b'chr', b'Cherokee'], [b'chu', b'Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church Slavonic'], [b'chv', b'Chuvash'], [b'chy', b'Cheyenne'], [b'cmc', b'Chamic languages'], [b'cop', b'Coptic'], [b'cor', b'Cornish'], [b'cos', b'Corsican'], [b'cpe', b'Creoles and pidgins, English based'], [b'cpf', b'Creoles and pidgins, French-based'], [b'cpp', b'Creoles and pidgins, Portuguese-based'], [b'cre', b'Cree'], [b'crh', b'Crimean Tatar; Crimean Turkish'], [b'crp', b'Creoles and pidgins'], [b'csb', b'Kashubian'], [b'cus', b'Cushitic languages'], [b'cze', b'Czech'], [b'dak', b'Dakota'], [b'dan', b'Danish'], [b'dar', b'Dargwa'], [b'day', b'Land Dayak languages'], [b'del', b'Delaware'], [b'den', b'Slave (Athapascan)'], [b'dgr', b'Dogrib'], [b'din', b'Dinka'], [b'div', b'Divehi; Dhivehi; Maldivian'], [b'doi', b'Dogri'], [b'dra', b'Dravidian languages'], [b'dsb', b'Lower Sorbian'], [b'dua', b'Duala'], [b'dum', b'Dutch, Middle (ca. 1050-1350)'], [b'dut', b'Dutch; Flemish'], [b'dyu', b'Dyula'], [b'dzo', b'Dzongkha'], [b'efi', b'Efik'], [b'egy', b'Egyptian (Ancient)'], [b'eka', b'Ekajuk'], [b'elx', b'Elamite'], [b'eng', b'English'], [b'enm', b'English, Middle (1100-1500)'], [b'epo', b'Esperanto'], [b'est', b'Estonian'], [b'ewe', b'Ewe'], [b'ewo', b'Ewondo'], [b'fan', b'Fang'], [b'fao', b'Faroese'], [b'fat', b'Fanti'], [b'fij', b'Fijian'], [b'fil', b'Filipino; Pilipino'], [b'fin', b'Finnish'], [b'fiu', b'Finno-Ugrian languages'], [b'fon', b'Fon'], [b'fre', b'French'], [b'frm', b'French, Middle (ca. 1400-1600)'], [b'fro', b'French, Old (842-ca. 1400)'], [b'frr', b'Northern Frisian'], [b'frs', b'Eastern Frisian'], [b'fry', b'Western Frisian'], [b'ful', b'Fulah'], [b'fur', b'Friulian'], [b'gaa', b'Ga'], [b'gay', b'Gayo'], [b'gba', b'Gbaya'], [b'gem', b'Germanic languages'], [b'geo', b'Georgian'], [b'ger', b'German'], [b'gez', b'Geez'], [b'gil', b'Gilbertese'], [b'gla', b'Gaelic; Scottish Gaelic'], [b'gle', b'Irish'], [b'glg', b'Galician'], [b'glv', b'Manx'], [b'gmh', b'German, Middle High (ca. 1050-1500)'], [b'goh', b'German, Old High (ca. 750-1050)'], [b'gon', b'Gondi'], [b'gor', b'Gorontalo'], [b'got', b'Gothic'], [b'grb', b'Grebo'], [b'grc', b'Greek, Ancient (to 1453)'], [b'gre', b'Greek, Modern (1453-)'], [b'grn', b'Guarani'], [b'gsw', b'Swiss German; Alemannic; Alsatian'], [b'guj', b'Gujarati'], [b'gwi', b"Gwich'in"], [b'hai', b'Haida'], [b'hat', b'Haitian; Haitian Creole'], [b'hau', b'Hausa'], [b'haw', b'Hawaiian'], [b'heb', b'Hebrew'], [b'her', b'Herero'], [b'hil', b'Hiligaynon'], [b'him', b'Himachali languages; Western Pahari languages'], [b'hin', b'Hindi'], [b'hit', b'Hittite'], [b'hmn', b'Hmong; Mong'], [b'hmo', b'Hiri Motu'], [b'hrv', b'Croatian'], [b'hsb', b'Upper Sorbian'], [b'hun', b'Hungarian'], [b'hup', b'Hupa'], [b'iba', b'Iban'], [b'ibo', b'Igbo'], [b'ice', b'Icelandic'], [b'ido', b'Ido'], [b'iii', b'Sichuan Yi; Nuosu'], [b'ijo', b'Ijo languages'], [b'iku', b'Inuktitut'], [b'ile', b'Interlingue; Occidental'], [b'ilo', b'Iloko'], [b'ina', b'Interlingua (International Auxiliary Language Association)'], [b'inc', b'Indic languages'], [b'ind', b'Indonesian'], [b'ine', b'Indo-European languages'], [b'inh', b'Ingush'], [b'ipk', b'Inupiaq'], [b'ira', b'Iranian languages'], [b'iro', b'Iroquoian languages'], [b'ita', b'Italian'], [b'jav', b'Javanese'], [b'jbo', b'Lojban'], [b'jpn', b'Japanese'], [b'jpr', b'Judeo-Persian'], [b'jrb', b'Judeo-Arabic'], [b'kaa', b'Kara-Kalpak'], [b'kab', b'Kabyle'], [b'kac', b'Kachin; Jingpho'], [b'kal', b'Kalaallisut; Greenlandic'], [b'kam', b'Kamba'], [b'kan', b'Kannada'], [b'kar', b'Karen languages'], [b'kas', b'Kashmiri'], [b'kau', b'Kanuri'], [b'kaw', b'Kawi'], [b'kaz', b'Kazakh'], [b'kbd', b'Kabardian'], [b'kha', b'Khasi'], [b'khi', b'Khoisan languages'], [b'khm', b'Central Khmer'], [b'kho', b'Khotanese;Sakan'], [b'kik', b'Kikuyu; Gikuyu'], [b'kin', b'Kinyarwanda'], [b'kir', b'Kirghiz; Kyrgyz'], [b'kmb', b'Kimbundu'], [b'kok', b'Konkani'], [b'kom', b'Komi'], [b'kon', b'Kongo'], [b'kor', b'Korean'], [b'kos', b'Kosraean'], [b'kpe', b'Kpelle'], [b'krc', b'Karachay-Balkar'], [b'krl', b'Karelian'], [b'kro', b'Kru languages'], [b'kru', b'Kurukh'], [b'kua', b'Kuanyama; Kwanyama'], [b'kum', b'Kumyk'], [b'kur', b'Kurdish'], [b'kut', b'Kutenai'], [b'lad', b'Ladino'], [b'lah', b'Lahnda'], [b'lam', b'Lamba'], [b'lao', b'Lao'], [b'lat', b'Latin'], [b'lav', b'Latvian'], [b'lez', b'Lezghian'], [b'lim', b'Limburgan; Limburger; Limburgish'], [b'lin', b'Lingala'], [b'lit', b'Lithuanian'], [b'lol', b'Mongo'], [b'loz', b'Lozi'], [b'ltz', b'Luxembourgish; Letzeburgesch'], [b'lua', b'Luba-Lulua'], [b'lub', b'Luba-Katanga'], [b'lug', b'Ganda'], [b'lui', b'Luiseno'], [b'lun', b'Lunda'], [b'luo', b'Luo (Kenya and Tanzania)'], [b'lus', b'Lushai'], [b'mac', b'Macedonian'], [b'mad', b'Madurese'], [b'mag', b'Magahi'], [b'mah', b'Marshallese'], [b'mai', b'Maithili'], [b'mak', b'Makasar'], [b'mal', b'Malayalam'], [b'man', b'Mandingo'], [b'mao', b'Maori'], [b'map', b'Austronesian languages'], [b'mar', b'Marathi'], [b'mas', b'Masai'], [b'may', b'Malay'], [b'mdf', b'Moksha'], [b'mdr', b'Mandar'], [b'men', b'Mende'], [b'mga', b'Irish, Middle (900-1200)'], [b'mic', b"Mi'kmaq; Micmac"], [b'min', b'Minangkabau'], [b'mis', b'Uncoded languages'], [b'mkh', b'Mon-Khmer languages'], [b'mlg', b'Malagasy'], [b'mlt', b'Maltese'], [b'mnc', b'Manchu'], [b'mni', b'Manipuri'], [b'mno', b'Manobo languages'], [b'moh', b'Mohawk'], [b'mol', b'Moldavian; Moldovan'], [b'mon', b'Mongolian'], [b'mos', b'Mossi'], [b'mul', b'Multiple languages'], [b'mun', b'Munda languages'], [b'mus', b'Creek'], [b'mwl', b'Mirandese'], [b'mwr', b'Marwari'], [b'myn', b'Mayan languages'], [b'myv', b'Erzya'], [b'nah', b'Nahuatl languages'], [b'nai', b'North American Indian languages'], [b'nap', b'Neapolitan'], [b'nau', b'Nauru'], [b'nav', b'Navajo; Navaho'], [b'nbl', b'Ndebele, South; South Ndebele'], [b'nde', b'Ndebele, North; North Ndebele'], [b'ndo', b'Ndonga'], [b'nds', b'Low German; Low Saxon; German, Low; Saxon, Low'], [b'nep', b'Nepali'], [b'new', b'Nepal Bhasa; Newari'], [b'nia', b'Nias'], [b'nic', b'Niger-Kordofanian languages'], [b'niu', b'Niuean'], [b'nno', b'Norwegian Nynorsk; Nynorsk, Norwegian'], [b'nob', 'Bokm\xe5l, Norwegian; Norwegian Bokm\xe5l'], [b'nog', b'Nogai'], [b'non', b'Norse, Old'], [b'nor', b'Norwegian'], [b'nqo', b"N'Ko"], [b'nso', b'Pedi; Sepedi; Northern Sotho'], [b'nub', b'Nubian languages'], [b'nwc', b'Classical Newari; Old Newari; Classical Nepal Bhasa'], [b'nya', b'Chichewa; Chewa; Nyanja'], [b'nym', b'Nyamwezi'], [b'nyn', b'Nyankole'], [b'nyo', b'Nyoro'], [b'nzi', b'Nzima'], [b'oci', b'Occitan (post 1500)'], [b'oji', b'Ojibwa'], [b'ori', b'Oriya'], [b'orm', b'Oromo'], [b'osa', b'Osage'], [b'oss', b'Ossetian; Ossetic'], [b'ota', b'Turkish, Ottoman (1500-1928)'], [b'oto', b'Otomian languages'], [b'paa', b'Papuan languages'], [b'pag', b'Pangasinan'], [b'pal', b'Pahlavi'], [b'pam', b'Pampanga; Kapampangan'], [b'pan', b'Panjabi; Punjabi'], [b'pap', b'Papiamento'], [b'pau', b'Palauan'], [b'peo', b'Persian, Old (ca. 600-400 B.C.)'], [b'per', b'Persian'], [b'phi', b'Philippine languages'], [b'phn', b'Phoenician'], [b'pli', b'Pali'], [b'pol', b'Polish'], [b'pon', b'Pohnpeian'], [b'por', b'Portuguese'], [b'pra', b'Prakrit languages'], [b'pro', 'Proven\xe7al, Old (to 1500); Occitan, Old (to 1500)'], [b'pus', b'Pushto; Pashto'], [b'qaa-qtz', b'Reserved for local use'], [b'que', b'Quechua'], [b'raj', b'Rajasthani'], [b'rap', b'Rapanui'], [b'rar', b'Rarotongan; Cook Islands Maori'], [b'roa', b'Romance languages'], [b'roh', b'Romansh'], [b'rom', b'Romany'], [b'rum', b'Romanian'], [b'run', b'Rundi'], [b'rup', b'Aromanian; Arumanian; Macedo-Romanian'], [b'rus', b'Russian'], [b'sad', b'Sandawe'], [b'sag', b'Sango'], [b'sah', b'Yakut'], [b'sai', b'South American Indian languages'], [b'sal', b'Salishan languages'], [b'sam', b'Samaritan Aramaic'], [b'san', b'Sanskrit'], [b'sas', b'Sasak'], [b'sat', b'Santali'], [b'scn', b'Sicilian'], [b'sco', b'Scots'], [b'sel', b'Selkup'], [b'sem', b'Semitic languages'], [b'sga', b'Irish, Old (to 900)'], [b'sgn', b'Sign Languages'], [b'shn', b'Shan'], [b'sid', b'Sidamo'], [b'sin', b'Sinhala; Sinhalese'], [b'sio', b'Siouan languages'], [b'sit', b'Sino-Tibetan languages'], [b'sla', b'Slavic languages'], [b'slo', b'Slovak'], [b'slv', b'Slovenian'], [b'sma', b'Southern Sami'], [b'sme', b'Northern Sami'], [b'smi', b'Sami languages'], [b'smj', b'Lule Sami'], [b'smn', b'Inari Sami'], [b'smo', b'Samoan'], [b'sms', b'Skolt Sami'], [b'sna', b'Shona'], [b'snd', b'Sindhi'], [b'snk', b'Soninke'], [b'sog', b'Sogdian'], [b'som', b'Somali'], [b'son', b'Songhai languages'], [b'sot', b'Sotho, Southern'], [b'spa', b'Spanish; Castilian'], [b'srd', b'Sardinian'], [b'srn', b'Sranan Tongo'], [b'srp', b'Serbian'], [b'srr', b'Serer'], [b'ssa', b'Nilo-Saharan languages'], [b'ssw', b'Swati'], [b'suk', b'Sukuma'], [b'sun', b'Sundanese'], [b'sus', b'Susu'], [b'sux', b'Sumerian'], [b'swa', b'Swahili'], [b'swe', b'Swedish'], [b'syc', b'Classical Syriac'], [b'syr', b'Syriac'], [b'tah', b'Tahitian'], [b'tai', b'Tai languages'], [b'tam', b'Tamil'], [b'tat', b'Tatar'], [b'tel', b'Telugu'], [b'tem', b'Timne'], [b'ter', b'Tereno'], [b'tet', b'Tetum'], [b'tgk', b'Tajik'], [b'tgl', b'Tagalog'], [b'tha', b'Thai'], [b'tib', b'Tibetan'], [b'tig', b'Tigre'], [b'tir', b'Tigrinya'], [b'tiv', b'Tiv'], [b'tkl', b'Tokelau'], [b'tlh', b'Klingon; tlhIngan-Hol'], [b'tli', b'Tlingit'], [b'tmh', b'Tamashek'], [b'tog', b'Tonga (Nyasa)'], [b'ton', b'Tonga (Tonga Islands)'], [b'tpi', b'Tok Pisin'], [b'tsi', b'Tsimshian'], [b'tsn', b'Tswana'], [b'tso', b'Tsonga'], [b'tuk', b'Turkmen'], [b'tum', b'Tumbuka'], [b'tup', b'Tupi languages'], [b'tur', b'Turkish'], [b'tut', b'Altaic languages'], [b'tvl', b'Tuvalu'], [b'twi', b'Twi'], [b'tyv', b'Tuvinian'], [b'udm', b'Udmurt'], [b'uga', b'Ugaritic'], [b'uig', b'Uighur; Uyghur'], [b'ukr', b'Ukrainian'], [b'umb', b'Umbundu'], [b'und', b'Undetermined'], [b'urd', b'Urdu'], [b'uzb', b'Uzbek'], [b'vai', b'Vai'], [b'ven', b'Venda'], [b'vie', b'Vietnamese'], [b'vol', 'Volap\xfck'], [b'vot', b'Votic'], [b'wak', b'Wakashan languages'], [b'wal', b'Wolaitta; Wolaytta'], [b'war', b'Waray'], [b'was', b'Washo'], [b'wel', b'Welsh'], [b'wen', b'Sorbian languages'], [b'wln', b'Walloon'], [b'wol', b'Wolof'], [b'xal', b'Kalmyk; Oirat'], [b'xho', b'Xhosa'], [b'yao', b'Yao'], [b'yap', b'Yapese'], [b'yid', b'Yiddish'], [b'yor', b'Yoruba'], [b'ypk', b'Yupik languages'], [b'zap', b'Zapotec'], [b'zbl', b'Blissymbols; Blissymbolics; Bliss'], [b'zen', b'Zenaga'], [b'zgh', b'Standard Moroccan Tamazight'], [b'zha', b'Zhuang; Chuang'], [b'znd', b'Zande languages'], [b'zul', b'Zulu'], [b'zun', b'Zuni'], [b'zxx', b'No linguistic content; Not applicable'], [b'zza', b'Zaza; Dimili; Dimli; Kirdki; Kirmanjki; Zazaki']]), + preserve_default=True, + ), + ] diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 94ab089507..a2090046c6 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -7,11 +7,12 @@ import os import uuid from django.contrib.auth.models import User +from django.core.files import File from django.core.urlresolvers import reverse from django.db import models, transaction from django.utils.encoding import python_2_unicode_compatible from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import ugettext, ugettext_lazy as _ from common.literals import TIME_DELTA_UNIT_CHOICES from common.models import SharedUploadedFile @@ -75,18 +76,15 @@ class DocumentType(models.Model): return super(DocumentType, self).delete(*args, **kwargs) def new_document(self, file_object, label=None, description=None, language=None, _user=None): - if not language: - language = setting_language.value + try: + with transaction.atomic(): + document = self.documents.create(description=description or '', label=label or unicode(file_object), language=language or setting_language.value) + document.save(_user=_user) - if not label: - label = unicode(file_object) - - document = self.documents.create(description=description or '', language=language, label=label) - document.save(_user=_user) - - document.new_version(file_object=file_object, _user=_user) - - return document + return document.new_version(file_object=file_object, _user=_user) + except Exception as exception: + logger.critical('Unexpected exception while trying to create new document "%s" from document type "%s"; %s', label or unicode(file_object), self, exception) + raise class Meta: ordering = ('label',) @@ -102,10 +100,10 @@ class Document(models.Model): uuid = models.CharField(default=UUID_FUNCTION, editable=False, max_length=48) document_type = models.ForeignKey(DocumentType, related_name='documents', verbose_name=_('Document type')) - label = models.CharField(db_index=True, default=_('Uninitialized document'), max_length=255, help_text=_('The name of the document'), verbose_name=_('Label')) - description = models.TextField(blank=True, verbose_name=_('Description')) + label = models.CharField(blank=True, db_index=True, default='', max_length=255, help_text=_('The name of the document'), verbose_name=_('Label')) + description = models.TextField(blank=True, default='', verbose_name=_('Description')) date_added = models.DateTimeField(auto_now_add=True, db_index=True, verbose_name=_('Added')) - language = models.CharField(choices=setting_language_choices.value, default=setting_language.value, max_length=8, verbose_name=_('Language')) + language = models.CharField(blank=True, 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?')) deleted_date_time = models.DateTimeField(blank=True, editable=True, null=True, verbose_name=_('Date and time trashed')) is_stub = models.BooleanField(default=True, editable=False, verbose_name=_('Is stub?')) @@ -132,7 +130,7 @@ class Document(models.Model): document_version.invalidate_cache() def __str__(self): - return self.label + return self.label or ugettext('Document stub, id: %d') % self.pk def get_absolute_url(self): return reverse('documents:document_preview', args=[self.pk]) @@ -174,23 +172,13 @@ class Document(models.Model): return self.latest_version.size def new_version(self, file_object, comment=None, _user=None): - from .tasks import task_upload_new_version + logger.info('Creating new document version for document: %s', self) - logger.info('Queueing creation of a new document version for document: %s', self) - - shared_uploaded_file = SharedUploadedFile.objects.create(file=file_object) - - if _user: - user_id = _user.pk - else: - user_id = None - - task_upload_new_version.apply_async(kwargs=dict( - shared_uploaded_file_id=shared_uploaded_file.pk, - document_id=self.pk, user_id=user_id, - )) + document_version = DocumentVersion(document=self, comment=comment, file=File(file_object)) + document_version.save(_user=_user) logger.info('New document version queued for document: %s', self) + return document_version # Proxy methods def open(self, *args, **kwargs): @@ -211,10 +199,6 @@ class Document(models.Model): return self.latest_version.exists() # Compatibility methods - @property - def file(self): - return self.latest_version.file - @property def file_mimetype(self): return self.latest_version.mimetype @@ -252,6 +236,7 @@ class Document(models.Model): def latest_version(self): return self.versions.order_by('timestamp').last() + # TODO: look to remove, only used by the OCR parser def document_save_to_temp_dir(self, filename, buffer_size=1024 * 1024): temporary_path = os.path.join(setting_temporary_directory.value, filename) return self.save_to_file(temporary_path, buffer_size) @@ -282,7 +267,7 @@ class DocumentVersion(models.Model): document = models.ForeignKey(Document, related_name='versions', verbose_name=_('Document')) timestamp = models.DateTimeField(auto_now_add=True, db_index=True, verbose_name=_('Timestamp')) - comment = models.TextField(blank=True, verbose_name=_('Comment')) + comment = models.TextField(blank=True, default='', null=True, verbose_name=_('Comment')) # File related fields file = models.FileField(storage=storage_backend, upload_to=UUID_FUNCTION, verbose_name=_('File')) @@ -326,6 +311,9 @@ class DocumentVersion(models.Model): logger.info('New document version "%s" created for document: %s', self, self.document) self.document.is_stub = False + if not self.document.label: + self.document.label = unicode(self.file) + self.document.save() except Exception as exception: logger.error('Error creating new document version for document "%s"; %s', self.document, exception) diff --git a/mayan/apps/documents/tasks.py b/mayan/apps/documents/tasks.py index bda74695ee..778b21da1b 100644 --- a/mayan/apps/documents/tasks.py +++ b/mayan/apps/documents/tasks.py @@ -12,7 +12,8 @@ from mayan.celery import app from common.models import SharedUploadedFile from .literals import ( - UPDATE_PAGE_COUNT_RETRY_DELAY, UPLOAD_NEW_VERSION_RETRY_DELAY + UPDATE_PAGE_COUNT_RETRY_DELAY, UPLOAD_NEW_VERSION_RETRY_DELAY, + NEW_DOCUMENT_RETRY_DELAY ) from .models import ( DeletedDocument, Document, DocumentPage, DocumentType, DocumentVersion @@ -83,27 +84,49 @@ def task_update_page_count(self, version_id): raise self.retry(exc=exception) +@app.task(bind=True, default_retry_delay=NEW_DOCUMENT_RETRY_DELAY, ignore_result=True) +def task_upload_new_document(self, document_type_id, shared_uploaded_file_id, description=None, label=None, language=None, user_id=None): + try: + document_type = DocumentType.objects.get(pk=document_type_id) + shared_file = SharedUploadedFile.objects.get(pk=shared_uploaded_file_id) + if user_id: + user = User.objects.get(pk=user_id) + else: + user = None + + except OperationalError as exception: + logger.warning('Operational error during attempt to gather data for new document: %s; Retrying.', exception) + raise self.retry(exc=exception) + + try: + with shared_file.open as file_object: + document_version = document_type.new_document(self, file_object=file_object, label=label, description=description, language=language, _user=user) + except OperationalError as exception: + logger.warning('Operational error during attempt to gather data for new document: %s; Retrying.', exception) + raise self.retry(exc=exception) + + try: + shared_file.delete() + except OperationalError as exception: + logger.warning('Operational error while trying to delete shared file used to upload new document: %s; %s. Retrying.', document_version.document, exception) + + @app.task(bind=True, default_retry_delay=UPLOAD_NEW_VERSION_RETRY_DELAY, ignore_result=True) def task_upload_new_version(self, document_id, shared_uploaded_file_id, user_id, comment=None): try: document = Document.objects.get(pk=document_id) - except OperationalError as exception: - logger.warning('Operational error during attempt to retrieve document: %s; %s. Retrying.', document_id, exception) - raise self.retry(exc=exception) - - try: shared_file = SharedUploadedFile.objects.get(pk=shared_uploaded_file_id) - except OperationalError as exception: - logger.warning('Operational error during attempt to retrieve shared file: %s; %s. Retrying.', shared_uploaded_file_id, exception) - raise self.retry(exc=exception) + if user_id: + user = User.objects.get(pk=user_id) + else: + user = None - if user_id: - user = User.objects.get(pk=user_id) - else: - user = None + except OperationalError as exception: + logger.warning('Operational error during attempt to retrieve shared data for new document version for:%s; %s. Retrying.', document, exception) + raise self.retry(exc=exception) with shared_file.open() as file_object: - document_version = DocumentVersion(document=document, comment=comment or '', file=file_object) + document_version = DocumentVersion(document=document, comment=comment, file=file_object) try: document_version.save(_user=user) except Warning as warning: @@ -119,9 +142,9 @@ def task_upload_new_version(self, document_id, shared_uploaded_file_id, user_id, try: shared_file.delete() except OperationalError as exception: - logger.warning('Operational error during attempt to delete shared file: %s; %s. Retrying.', shared_file, exception) + logger.warning('Operational error during attempt to delete shared file: %s; %s.', shared_file, exception) else: try: shared_file.delete() except OperationalError as exception: - logger.warning('Operational error during attempt to delete shared file: %s; %s. Retrying.', shared_file, exception) + logger.warning('Operational error during attempt to delete shared file: %s; %s.', shared_file, exception) diff --git a/mayan/apps/documents/test_models.py b/mayan/apps/documents/test_models.py index 2490f07d0c..37a6f1e8b3 100644 --- a/mayan/apps/documents/test_models.py +++ b/mayan/apps/documents/test_models.py @@ -32,7 +32,7 @@ class DocumentTestCase(TestCase): ocr_settings.save() with open(TEST_DOCUMENT_PATH) as file_object: - self.document = self.document_type.new_document(file_object=File(file_object), label='mayan_11_1.pdf') + self.document = self.document_type.new_document(file_object=File(file_object), label='mayan_11_1.pdf').document def tearDown(self): self.document_type.delete() diff --git a/mayan/apps/documents/test_views.py b/mayan/apps/documents/test_views.py index e1290e1273..be5a74a6af 100644 --- a/mayan/apps/documents/test_views.py +++ b/mayan/apps/documents/test_views.py @@ -35,7 +35,7 @@ class DocumentsViewsFunctionalTestCase(TestCase): self.assertTrue(self.admin_user.is_authenticated()) with open(TEST_SMALL_DOCUMENT_PATH) as file_object: - self.document = self.document_type.new_document(file_object=File(file_object), label='mayan_11_1.pdf') + self.document = self.document_type.new_document(file_object=File(file_object), label='mayan_11_1.pdf').document def tearDown(self): self.document_type.delete()