From 84ea51b24eb76cc9b85c2d11a005fe30712ae761 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 2 Dec 2013 20:31:14 +0100 Subject: i18n on document template --- ishtar_common/models.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 8d153f120..7777d7d77 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -743,6 +743,11 @@ class Person(Address, OwnPerms, ValueGetter) : if getattr(self, attr)] return u" ".join(values) + def get_values(self, prefix=''): + values = super(Person, self).get_values(prefix=prefix) + values[prefix+'title'] = dict(self.TYPE)[self.title] + return values + person_types_list_lbl = _(u"Types") @property def person_types_list(self): -- cgit v1.2.3 From e53dafe0aadc4f20bb05e875e982da65f9b01944 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 2 Dec 2013 20:51:53 +0100 Subject: Prevent unicode problem when generating an ooo file --- ishtar_common/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 7777d7d77..00a37ed97 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -640,7 +640,7 @@ class DocumentTemplate(models.Model): def publish(self, c_object): tempdir = tempfile.mkdtemp("-ishtardocs") output_name = tempdir + os.path.sep + \ - self.name.replace(' ', '_').lower() + u'-' +\ + slugify(self.name.replace(' ', '_').lower()) + u'-' +\ datetime.date.today().strftime('%Y-%m-%d') +\ u"." + self.template.name.split('.')[-1] missing = ooo_replace(self.template, output_name, c_object.get_values()) -- cgit v1.2.3 From fcd09257520b250a13c3a084a48a7e570bbcc633 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 5 Dec 2013 01:25:04 +0100 Subject: More precise value getter for document generation --- ishtar_common/models.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 00a37ed97..fc5ef00a0 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -76,6 +76,15 @@ class ValueGetter(object): values[prefix + field_name] = value return values + @classmethod + def get_empty_values(cls, prefix=''): + if not prefix: + prefix = self._prefix + values = {} + for field_name in cls._meta.get_all_field_names(): + values[prefix + field_name] = '' + return values + class HistoricalRecords(BaseHistoricalRecords): def create_historical_record(self, instance, type): history_modifier = getattr(instance, 'history_modifier', None) @@ -643,6 +652,7 @@ class DocumentTemplate(models.Model): slugify(self.name.replace(' ', '_').lower()) + u'-' +\ datetime.date.today().strftime('%Y-%m-%d') +\ u"." + self.template.name.split('.')[-1] + print c_object.get_values() missing = ooo_replace(self.template, output_name, c_object.get_values()) return output_name @@ -681,7 +691,7 @@ class OrganizationType(GeneralType): verbose_name_plural = _(u"Organization types") ordering = ('label',) -class Organization(Address, OwnPerms): +class Organization(Address, OwnPerms, ValueGetter): name = models.CharField(_(u"Name"), max_length=100) organization_type = models.ForeignKey(OrganizationType, verbose_name=_(u"Type")) @@ -746,6 +756,8 @@ class Person(Address, OwnPerms, ValueGetter) : def get_values(self, prefix=''): values = super(Person, self).get_values(prefix=prefix) values[prefix+'title'] = dict(self.TYPE)[self.title] + if not self.attached_to: + values.update(Person.get_empty_values(prefix=prefix + 'attached_to_')) return values person_types_list_lbl = _(u"Types") -- cgit v1.2.3 From 6659cd49fbd62ad046c070d6fb51b8ecaabacb72 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 5 Dec 2013 01:30:34 +0100 Subject: Cleaning --- ishtar_common/models.py | 1 - 1 file changed, 1 deletion(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index fc5ef00a0..57bcee5c5 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -652,7 +652,6 @@ class DocumentTemplate(models.Model): slugify(self.name.replace(' ', '_').lower()) + u'-' +\ datetime.date.today().strftime('%Y-%m-%d') +\ u"." + self.template.name.split('.')[-1] - print c_object.get_values() missing = ooo_replace(self.template, output_name, c_object.get_values()) return output_name -- cgit v1.2.3