diff --git a/git password.txt b/bitbucket app password.txt similarity index 100% rename from git password.txt rename to bitbucket app password.txt diff --git a/diff.txt b/diff.txt deleted file mode 100644 index e69de29..0000000 diff --git a/mondumas.egg-info/PKG-INFO b/mondumas.egg-info/PKG-INFO index f02fdca..930c664 100644 --- a/mondumas.egg-info/PKG-INFO +++ b/mondumas.egg-info/PKG-INFO @@ -2,7 +2,7 @@ Metadata-Version: 2.1 Name: mondumas Version: 1.0 Summary: mondumas -Home-page: UNKNOWN +Home-page: Author: Author-email: License: UNKNOWN diff --git a/mondumas.egg-info/SOURCES.txt b/mondumas.egg-info/SOURCES.txt index e9c7c8f..5d9857d 100644 --- a/mondumas.egg-info/SOURCES.txt +++ b/mondumas.egg-info/SOURCES.txt @@ -1,6 +1,7 @@ CHANGES.txt MANIFEST.in README.md +bitbucket app password.txt development.ini diff.txt production.ini diff --git a/mondumas.egg-info/entry_points.txt b/mondumas.egg-info/entry_points.txt index 19e4c93..1454dfe 100644 --- a/mondumas.egg-info/entry_points.txt +++ b/mondumas.egg-info/entry_points.txt @@ -1,4 +1,2 @@ - [paste.app_factory] - main = mondumas:main - [console_scripts] - \ No newline at end of file +[paste.app_factory] +main = mondumas:main diff --git a/mondumas.egg-info/requires.txt b/mondumas.egg-info/requires.txt index 6404102..92fcd39 100644 --- a/mondumas.egg-info/requires.txt +++ b/mondumas.egg-info/requires.txt @@ -4,7 +4,7 @@ pyramid_debugtoolbar pyramid_layout pyramid_mailer pyramid_tm -SQLAlchemy +SQLAlchemy==1.2.19 transaction zope.sqlalchemy==1.1 waitress diff --git a/mondumas/routes.py b/mondumas/routes.py index acf51a4..77edd74 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -67,7 +67,6 @@ def includeme(config): config.add_route('dashboard', '/dashboard') config.add_route('emails_msg', '/emails_msg/{nolig}') config.add_route('expert_edit', '/expert_edit/{code_cab}/{code_exp}') - config.add_route('infrastructure', '/infrastructure') config.add_route('rappels_rdv', '/rappels_rdv') config.add_route('rdf_cause_edit', '/rdf_cause_edit/{code}') config.add_route('rdf_causes', '/rdf_causes') diff --git a/mondumas/templates/parametres/infrastructure.pt b/mondumas/templates/parametres/infrastructure.pt deleted file mode 100644 index 9b2a502..0000000 --- a/mondumas/templates/parametres/infrastructure.pt +++ /dev/null @@ -1,124 +0,0 @@ - -
- -

POSTES de TRAVAIL

-
-
-
-
- -

15 ordinateurs

-
-
- -

1 portable

-
-
- -

4 imprimantes réseau

-
-
- -

10 tablettes

-
-
-
-
- -

SERVEURS WINDOWS

-
-
-
- -

SRV2012

- Serveur HYPER-V -
-
- -

SRVTSE

- Serveur Accès à Distance -
-
- -

SRVBD / DC

- Serveur Base de données -
-
- -

SECOURS

- Serveur de secours -
-
-
- -
-

SERVEUR LINUX

-
-
-
- -

SRVWEB

-
-
-
-
- -

CONNECTION INTERNET

-
-
-
- -
-
-
-
-
-

Routeur SFR Fibre 10 Mbps

-
-
- -
-
- -
-
-

Router ORANGE ADSL2

-
-
-
-
-
- -
-
-
-
-
-
- -

Serveurs

-
-
- -

Ordinateurs

-
-
- -

Imprimantes

-
-
- -

Bornes Wifi

-
-
- -
-
- -
-
- -
- - - diff --git a/mondumas/templates/parametres/parametres.pt b/mondumas/templates/parametres/parametres.pt index e34783c..525973c 100644 --- a/mondumas/templates/parametres/parametres.pt +++ b/mondumas/templates/parametres/parametres.pt @@ -54,12 +54,6 @@

STATS GLOBALES

-
-
- -

INFRASTRUCTURE

-
-


diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 27c9761..794e87d 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -269,7 +269,6 @@ def redefinir_mdp(request): @forbidden_view_config(renderer='../templates/default/login.pt') def login(request): - current_route_path = request.current_route_path() login = '' login_url = request.route_url('login') @@ -280,6 +279,7 @@ def login(request): came_from = request.params.get('came_from', referrer) password = '' message = '' + if 'form.submitted' in request.params: login = request.params['login'] password = request.params['password'] diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index d815661..6f5b4a5 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -1071,8 +1071,12 @@ def demandes_dl(request): email_from = request.matchdict['email_from'] email_uid = request.matchdict['email_uid'] logged_in = request.authenticated_userid.upper() + message = '' - + if message == '': + request.session.flash("Cette fonction est désactivée dans cette version de test", 'warning') + return HTTPFound(request.route_url('demandes')) + if 'maif' in email_from: search_criteria = 'FROM gestionsinistre@maif.fr SUBJECT "Intervention entreprise partenaire" UNDELETED' else: @@ -1088,13 +1092,13 @@ def demandes_dl(request): rv, data = conn.search(None, search_criteria) if rv != 'OK': request.session.flash("ERREUR de lecture de la boîte de réception", 'danger') - return HTTPFound(location=request.route_url('messages')) + return HTTPFound(location=request.route_url('demandes')) # lire le message avec UID rv, msg_data = conn.fetch(email_uid, '(RFC822)') if rv != 'OK': request.session.flash("ERREUR de lecture du message %S-%s" % (email_from, email_uid), 'danger') - return HTTPFound(location=request.route_url('messages')) + return HTTPFound(location=request.route_url('demandes')) email_message = email.message_from_bytes(msg_data[0][1]) diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py index 6fe8220..f88ffd9 100644 --- a/mondumas/views/parametres.py +++ b/mondumas/views/parametres.py @@ -37,14 +37,7 @@ def parametres(request): 'logged_in': logged_in, } -@view_config(route_name='infrastructure', renderer='../templates/parametres/infrastructure.pt', permission='manage') -def infrastructure(request): - logged_in = request.authenticated_userid.lower() - return { - 'page_title': "Infrastructure", - 'logged_in': logged_in, - } @view_config(route_name='users', renderer='../templates/parametres/users.pt', permission='manage') def users(request):