Skip to content

Commit

Permalink
Merge pull request #42 from PyAr/normaliz-nickname-import
Browse files Browse the repository at this point in the history
Normalized nickname field and better import of local settings.
  • Loading branch information
facundobatista authored Feb 9, 2019
2 parents 83d4929 + 9132093 commit ac7a2c6
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 3 deletions.
18 changes: 18 additions & 0 deletions website/members/migrations/0020_auto_20190209_1148.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 2.0.4 on 2019-02-09 11:48

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('members', '0019_auto_20190127_2007'),
]

operations = [
migrations.AlterField(
model_name='person',
name='nickname',
field=models.CharField(blank=True, help_text='Nick o sobrenombre', max_length=317, verbose_name='nick'),
),
]
6 changes: 3 additions & 3 deletions website/website/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ class Base(Configuration):
MEDIA_ROOT = BASE_DIR


# try to import the local settings; if the file is not there just create a stub class
# for the inheritance later
try:
from local_settings import LocalSettings
except ImportError as err:
print("Error importing local settings", repr(err))

except ModuleNotFoundError as err:
class LocalSettings:
pass

Expand Down

0 comments on commit ac7a2c6

Please sign in to comment.