diff --git a/development.ini b/development.ini index 1ecf4f0..57d2095 100644 --- a/development.ini +++ b/development.ini @@ -22,6 +22,7 @@ sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8 # sqlalchemy.url = mysql://root:cni/@srvbd/bddevfac?charset=utf8 mondumas.admin_email = ctphuoc@bbox.fr +mondumas.aem2010Dir = mondumas:static/img/AEM2010/ # Mailer configuration mail.host = smtp.bbox.fr diff --git a/mondumas/static/img/link2DEVFAC14.bat b/mondumas/static/img/link2DEVFAC14.bat new file mode 100644 index 0000000..35bba9a --- /dev/null +++ b/mondumas/static/img/link2DEVFAC14.bat @@ -0,0 +1 @@ +mklink /J DEVFAC14 C:\DEVFAC14 diff --git a/mondumas/templates/agenda/rdv_edit.pt b/mondumas/templates/agenda/rdv_edit.pt index 12fa5f8..ff8ada9 100644 --- a/mondumas/templates/agenda/rdv_edit.pt +++ b/mondumas/templates/agenda/rdv_edit.pt @@ -68,7 +68,7 @@ Dossier diff --git a/mondumas/templates/default/suivi_edit.pt b/mondumas/templates/dossier/suivi_edit.pt similarity index 94% rename from mondumas/templates/default/suivi_edit.pt rename to mondumas/templates/dossier/suivi_edit.pt index 1f2eba6..0eb2c70 100644 --- a/mondumas/templates/default/suivi_edit.pt +++ b/mondumas/templates/dossier/suivi_edit.pt @@ -46,8 +46,8 @@ Annuler - diff --git a/mondumas/views/agenda.py b/mondumas/views/agenda.py index 881a19a..6370728 100644 --- a/mondumas/views/agenda.py +++ b/mondumas/views/agenda.py @@ -66,6 +66,7 @@ def rdv_edit(request): return { 'page_title': page_title, 'url': url, + 'logged_in': logged_in, 'nodossier': nodossier, 'nolig': nolig, 'rdv': rdv, diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index eaf4889..c081cb8 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -198,6 +198,7 @@ def suivi_edit(request): return { 'page_title': page_title, + 'logged_in': logged_in, 'url': url, 'nodossier': nodossier, 'nolig': nolig, diff --git a/production.ini b/production.ini index 4fb9a6b..80cdf93 100644 --- a/production.ini +++ b/production.ini @@ -22,6 +22,7 @@ sqlalchemy.url = mysql://root:cni/@srvbd/bddevfac?charset=utf8 sqlalchemy.pool_recycle = 3600 mondumas.admin_email = phuoc@caotek.fr +mondumas.aem2010Dir = mondumas:static/img/AEM2010/ # Mailer configuration mail.host = smtp.orange.fr