Revision 7365fb51
Suppression du dossier "vigiboard.model".
Toutes les références à ce dossier doivent être remplacées par des références à "vigilo.models".
Cas particulier: DBSession doit être importé explicitement depuis "vigilo.models.session".
Adpatation du reste du code de l'appli pour tenir compte de ce changement.
git-svn-id: https://vigilo-dev.si.c-s.fr/svn@1756 b22e2e97-25c9-44ff-b637-2e5ceca36478
| vigiboard/config/app_cfg.py | ||
|---|---|---|
| 14 | 14 |
|
| 15 | 15 |
""" |
| 16 | 16 |
|
| 17 |
from vigilo import models |
|
| 18 |
from vigilo.models.session import DBSession |
|
| 19 |
from vigilo.models.vigilo_bdd_config import metadata |
|
| 20 |
metadata.bind = DBSession.bind |
|
| 21 |
|
|
| 17 | 22 |
from vigilo.turbogears import VigiloAppConfig |
| 18 | 23 |
from pylons.i18n import lazy_ugettext as l_ |
| 19 | 24 |
|
| 20 | 25 |
import vigiboard |
| 21 |
from vigiboard import model |
|
| 22 | 26 |
from vigiboard.lib import app_globals, helpers |
| 23 | 27 |
|
| 28 |
|
|
| 24 | 29 |
base_config = VigiloAppConfig('vigiboard')
|
| 25 | 30 |
base_config.renderers = [] |
| 26 | 31 |
|
| ... | ... | |
| 36 | 41 |
|
| 37 | 42 |
#Configure the base SQLALchemy Setup |
| 38 | 43 |
base_config.use_sqlalchemy = True |
| 39 |
base_config.model = model |
|
| 40 |
base_config.DBSession = model.DBSession
|
|
| 44 |
base_config.model = models
|
|
| 45 |
base_config.DBSession = DBSession |
|
| 41 | 46 |
|
| 42 | 47 |
# Configure the authentication backend |
| 43 | 48 |
base_config.auth_backend = 'sqlalchemy' |
| 44 |
base_config.sa_auth.dbsession = model.DBSession
|
|
| 49 |
base_config.sa_auth.dbsession = DBSession |
|
| 45 | 50 |
# what is the class you want to use to search for users in the database |
| 46 |
base_config.sa_auth.user_class = model.User |
|
| 51 |
base_config.sa_auth.user_class = models.User
|
|
| 47 | 52 |
# what is the class you want to use to search for groups in the database |
| 48 |
base_config.sa_auth.group_class = model.UserGroup |
|
| 53 |
base_config.sa_auth.group_class = models.UserGroup
|
|
| 49 | 54 |
# what is the class you want to use to search for permissions in the database |
| 50 |
base_config.sa_auth.permission_class = model.Permission |
|
| 55 |
base_config.sa_auth.permission_class = models.Permission
|
|
| 51 | 56 |
# The name "groups" is already used for groups of hosts. |
| 52 | 57 |
# We use "usergroups" when referering to users to avoid confusion. |
| 53 | 58 |
base_config.sa_auth.translations.groups = 'usergroups' |
Also available in: Unified diff