diff options
| -rw-r--r-- | ishtar_common/migrations/0092_auto_20190327_1854.py (renamed from ishtar_common/migrations/0091_auto_20190327_1854.py) | 2 | ||||
| -rw-r--r-- | ishtar_common/migrations/0093_ishtarsiteprofile_display_srs.py (renamed from ishtar_common/migrations/0092_ishtarsiteprofile_display_srs.py) | 2 | ||||
| -rw-r--r-- | ishtar_common/migrations/0094_auto_20190429_0950.py (renamed from ishtar_common/migrations/0093_auto_20190429_0950.py) | 2 | ||||
| -rw-r--r-- | ishtar_common/migrations/0095_auto_20190429_1041.py (renamed from ishtar_common/migrations/0094_auto_20190429_1041.py) | 2 | ||||
| -rw-r--r-- | ishtar_common/migrations/0096_tinyurl.py (renamed from ishtar_common/migrations/0095_tinyurl.py) | 2 | ||||
| -rw-r--r-- | ishtar_common/models.py | 21 |
6 files changed, 15 insertions, 16 deletions
diff --git a/ishtar_common/migrations/0091_auto_20190327_1854.py b/ishtar_common/migrations/0092_auto_20190327_1854.py index 8fb0ea0b2..69c6a9e56 100644 --- a/ishtar_common/migrations/0091_auto_20190327_1854.py +++ b/ishtar_common/migrations/0092_auto_20190327_1854.py @@ -12,7 +12,7 @@ import virtualtime class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0090_ishtarsiteprofile_locate_warehouses'), + ('ishtar_common', '0091_auto_20190502_1223'), ] operations = [ diff --git a/ishtar_common/migrations/0092_ishtarsiteprofile_display_srs.py b/ishtar_common/migrations/0093_ishtarsiteprofile_display_srs.py index 60936de59..6afdfdd2b 100644 --- a/ishtar_common/migrations/0092_ishtarsiteprofile_display_srs.py +++ b/ishtar_common/migrations/0093_ishtarsiteprofile_display_srs.py @@ -9,7 +9,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0091_auto_20190327_1854'), + ('ishtar_common', '0092_auto_20190327_1854'), ] operations = [ diff --git a/ishtar_common/migrations/0093_auto_20190429_0950.py b/ishtar_common/migrations/0094_auto_20190429_0950.py index a68c91dc2..4d82e2034 100644 --- a/ishtar_common/migrations/0093_auto_20190429_0950.py +++ b/ishtar_common/migrations/0094_auto_20190429_0950.py @@ -36,7 +36,7 @@ def migrate_to_model_fk(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0092_ishtarsiteprofile_display_srs'), + ('ishtar_common', '0093_ishtarsiteprofile_display_srs'), ] operations = [ diff --git a/ishtar_common/migrations/0094_auto_20190429_1041.py b/ishtar_common/migrations/0095_auto_20190429_1041.py index 58f3231e8..c73f9cb77 100644 --- a/ishtar_common/migrations/0094_auto_20190429_1041.py +++ b/ishtar_common/migrations/0095_auto_20190429_1041.py @@ -9,7 +9,7 @@ import django.db.models.deletion class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0093_auto_20190429_0950'), + ('ishtar_common', '0094_auto_20190429_0950'), ] operations = [ diff --git a/ishtar_common/migrations/0095_tinyurl.py b/ishtar_common/migrations/0096_tinyurl.py index dfe752c8c..58d5ce385 100644 --- a/ishtar_common/migrations/0095_tinyurl.py +++ b/ishtar_common/migrations/0096_tinyurl.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0094_auto_20190429_1041'), + ('ishtar_common', '0095_auto_20190429_1041'), ] operations = [ diff --git a/ishtar_common/models.py b/ishtar_common/models.py index e5721d922..15b341cb7 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -37,6 +37,9 @@ import time from io import BytesIO from subprocess import Popen, PIPE from PIL import Image +from ooopy.OOoPy import OOoPy +from ooopy.Transformer import Transformer as OOTransformer +import ooopy.Transforms as OOTransforms from django import forms from django.apps import apps @@ -3221,20 +3224,16 @@ class DocumentTemplate(models.Model): output = open(output_name, 'wb') output.write(result) output_name = main_output_name + suffix - # TODO: merge docs - return the last for now - from ooopy.OOoPy import OOoPy - from ooopy.Transformer import Transformer - import ooopy.Transforms as Transforms o = OOoPy(infile=names[0], outfile=output_name) if len(names) > 1: - t = Transformer( + t = OOTransformer( o.mimetype, - Transforms.get_meta(o.mimetype), - Transforms.Concatenate(*(names[1:])), - Transforms.renumber_all(o.mimetype), - Transforms.set_meta(o.mimetype), - Transforms.Fix_OOo_Tag(), - Transforms.Manifest_Append() + OOTransforms.get_meta(o.mimetype), + OOTransforms.Concatenate(*(names[1:])), + OOTransforms.renumber_all(o.mimetype), + OOTransforms.set_meta(o.mimetype), + OOTransforms.Fix_OOo_Tag(), + OOTransforms.Manifest_Append() ) t.transform (o) o.close() |