Browse Source

Merge branch 'rm_stuff_settings' into 'master'

Fix #97 Update settings.py

Closes #97

See merge request federez/re2o!129
paginateur
moamoak 8 years ago
parent
commit
08dbd2615f
  1. 5
      re2o/settings.py
  2. 2
      users/models.py

5
re2o/settings.py

@ -165,11 +165,6 @@ STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static_files')
RIGHTS_LINK = {
'cableur' : ['bureau','infra','bofh','tresorier'],
'bofh' : ['bureau','tresorier'],
}
GRAPH_MODELS = {
'all_applications': True,
'group_models': True,

2
users/models.py

@ -73,7 +73,7 @@ from reversion import revisions as reversion
import ldapdb.models
import ldapdb.models.fields
from re2o.settings import RIGHTS_LINK, LDAP, GID_RANGES, UID_RANGES
from re2o.settings import LDAP, GID_RANGES, UID_RANGES
from re2o.login import hashNT
from re2o.field_permissions import FieldPermissionModelMixin
from re2o.mixins import AclMixin, RevMixin

Loading…
Cancel
Save