diff options
| -rw-r--r-- | ishtar_common/forms.py | 4 | ||||
| -rw-r--r-- | ishtar_common/forms_common.py | 1 | ||||
| -rw-r--r-- | ishtar_common/migrations/0114_auto_20191212_1726.py | 25 | ||||
| -rw-r--r-- | ishtar_common/models.py | 1 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/sheet_organization.html | 1 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 2 |
6 files changed, 32 insertions, 2 deletions
diff --git a/ishtar_common/forms.py b/ishtar_common/forms.py index a7774df1f..dad2a300f 100644 --- a/ishtar_common/forms.py +++ b/ishtar_common/forms.py @@ -49,7 +49,9 @@ from ishtar_common.utils import MultiValueDict class NamedUrlSessionFormWizard(forms.Form): - def __init__(self, form_list, condition_list={}, url_name=''): + def __init__(self, form_list, condition_list=None, url_name=''): + if not condition_list: + condition_list = {} self.form_list = dict(form_list) self.condition_list = condition_list self.url_name = url_name diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 76e290713..7a6f2fe72 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -322,6 +322,7 @@ class OrganizationForm(ManageOldType, NewItemForm): label=_(u"Name"), max_length=300, validators=[name_validator]) organization_type = forms.ChoiceField(label=_(u"Organization type"), choices=[]) + url = forms.URLField(label=_("Web address"), required=False) address = forms.CharField(label=_(u"Address"), widget=forms.Textarea, required=False) address_complement = forms.CharField(label=_(u"Address complement"), diff --git a/ishtar_common/migrations/0114_auto_20191212_1726.py b/ishtar_common/migrations/0114_auto_20191212_1726.py new file mode 100644 index 000000000..9bfd34b11 --- /dev/null +++ b/ishtar_common/migrations/0114_auto_20191212_1726.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.18 on 2019-12-12 17:26 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0113_auto_20191209_1334'), + ] + + operations = [ + migrations.AddField( + model_name='historicalorganization', + name='url', + field=models.URLField(blank=True, null=True, verbose_name='Web address'), + ), + migrations.AddField( + model_name='organization', + name='url', + field=models.URLField(blank=True, null=True, verbose_name='Web address'), + ), + ] diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 03eda4781..04ac2ef38 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -4112,6 +4112,7 @@ class Organization(Address, Merge, OwnPerms, ValueGetter, MainItem): name = models.CharField(_("Name"), max_length=500) organization_type = models.ForeignKey(OrganizationType, verbose_name=_("Type")) + url = models.URLField(verbose_name=_("Web address"), blank=True, null=True) cached_label = models.TextField(_("Cached name"), null=True, blank=True, db_index=True) history = HistoricalRecords() diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html index e7bd79012..5229d934c 100644 --- a/ishtar_common/templates/ishtar/sheet_organization.html +++ b/ishtar_common/templates/ishtar/sheet_organization.html @@ -11,6 +11,7 @@ <div class="row"> {% field_flex "Name" item.name %} {% field_flex "Type" item.organization_type %} + {% field_flex_url "Web address" item.url %} {% field_flex_detail "Created by" item.history_creator.ishtaruser.person %} {% include "ishtar/blocks/sheet_address_section.html" %} {% field_flex "Phone" item.phone %} diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 3aba5bb9a..88cd70b43 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -366,7 +366,7 @@ def _get_values(request, val): if callable(v): v = v() try: - if hasattr(v, 'url'): + if hasattr(v, 'url') and v.url: v = (request.is_secure() and 'https' or 'http') + '://' + request.get_host() + v.url except ValueError: |