Merge pull request #87 from EsupPortail/dev

Dev
EsupPortail · Aug 30, 2018 · 169d0b8 · 169d0b8
2 parents 82d3dea + 6d3f0a9
commit 169d0b8
Show file tree

Hide file tree

Showing 45 changed files with 2,011 additions and 434 deletions.
diff --git a/docs/configuration.md b/docs/configuration.md
diff --git a/docs/installation.md b/docs/installation.md
diff --git a/pod/authentication/models.py b/pod/authentication/models.py
@@ -20,12 +20,19 @@
 AFFILIATION = getattr(
     settings, 'AFFILIATION',
     (
-        ('member', _('member')),
         ('student', _('student')),
+        ('faculty', _('faculty')),
         ('staff', _('staff')),
-        ('affiliate', _('affiliate')),
         ('employee', _('employee')),
-        ('faculty', _('faculty'))
+        ('member', _('member')),
+        ('affiliate', _('affiliate')),
+        ('alum', _('alum')),
+        ('library-walk-in', _('library-walk-in')),
+        ('researcher', _('researcher')),
+        ('retired', _('retired')),
+        ('emeritus', _('emeritus')),
+        ('teacher', _('teacher')),
+        ('registered-reader', _('registered-reader'))
     )
 )
 SECRET_KEY = getattr(settings, 'SECRET_KEY', '')