Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
francesco-filicetti committed Nov 3, 2021
2 parents e7a4b5d + 77e0a49 commit 980eaec
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ platforms:
releaseDate: '2021-11-03'
roadmap: 'https://github.com/UniversitaDellaCalabria/uniCMS/issues'
softwareType: standalone/web
softwareVersion: v0.29.0
softwareVersion: v0.29.1
url: 'https://github.com/UniversitaDellaCalabria/uniCMS'
usedBy:
- Università della Calabria - https://www.unical.it
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def get_requirements(fname='requirements.txt'):

setup(
name="unicms",
version='0.29.0',
version='0.29.1',
description="uniCMS is a Django Web Content Management System",
long_description=README,
long_description_content_type='text/markdown',
Expand Down
7 changes: 4 additions & 3 deletions src/cms/contacts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ class ContactInfo(ActivableModel, TimeStampedModel,
contact = models.ForeignKey(Contact, on_delete=models.CASCADE)
info_type = models.CharField(choices=EXTRA_INFO_TYPES,
max_length=15)
label = models.CharField(max_length=160)
label = models.CharField(max_length=160, blank=True, default='')
value = models.CharField(max_length=160)

class Meta:
Expand All @@ -110,7 +110,8 @@ def is_lockable_by(self, user):

def __str__(self):
return '[{}] {}: {}'.format(self.contact,
self.info_type, self.value)
self.info_type,
self.value)


class ContactInfoLocalization(ActivableModel,
Expand All @@ -121,7 +122,7 @@ class ContactInfoLocalization(ActivableModel,
language = models.CharField(choices=settings.LANGUAGES,
max_length=12,
default='en')
label = models.CharField(max_length=160)
label = models.CharField(max_length=160, blank=True, default='')
value = models.CharField(max_length=160)

class Meta:
Expand Down

0 comments on commit 980eaec

Please sign in to comment.