changements divers

.hgignore

@@ -4,3 +4,4 @@ Brie/data/sessions/*
 *.pyc
 *.swp
 *.swo
+Brie/tg2env/*

Brie/Brie.egg-info/SOURCES.txt

@@ -14,52 +14,69 @@ brie/websetup.py
 brie/config/__init__.py
 brie/config/app_cfg.py
 brie/config/environment.py
+brie/config/ldap_config.py
 brie/config/middleware.py
 brie/controllers/__init__.py
-brie/controllers/error.py
+brie/controllers/auth.py
+brie/controllers/edit.py
+brie/controllers/import_actions.py
+brie/controllers/rooms.py
 brie/controllers/root.py
-brie/controllers/secure.py
+brie/controllers/show.py
 brie/controllers/template.py
 brie/i18n/ru/LC_MESSAGES/brie.po
 brie/lib/__init__.py
 brie/lib/app_globals.py
 brie/lib/base.py
+brie/lib/camembert_helpers.py
 brie/lib/helpers.py
+brie/lib/ldap_helper.py
 brie/model/__init__.py
 brie/model/auth.py
+brie/model/camembert.py
+brie/model/ldap.py
 brie/public/favicon.ico
+brie/public/css/common.css
+brie/public/css/edit.css
+brie/public/css/rooms.css
+brie/public/css/show.css
 brie/public/css/style.css
-brie/public/images/contentbg.png
-brie/public/images/error.png
-brie/public/images/header_inner2.png
-brie/public/images/headerbg.png
-brie/public/images/info.png
-brie/public/images/inputbg.png
-brie/public/images/loginbg.png
-brie/public/images/loginbottombg.png
-brie/public/images/loginheader-left.png
-brie/public/images/loginheader-right.png
-brie/public/images/menu-item-actibg-first.png
-brie/public/images/menu-item-actibg.png
-brie/public/images/menu-item-border.png
-brie/public/images/menubg.png
-brie/public/images/ok.png
-brie/public/images/pagebg.png
-brie/public/images/star.png
-brie/public/images/strype2.png
-brie/public/images/under_the_hood_blue.png
-brie/public/images/warning.png
 brie/templates/__init__.py
-brie/templates/about.html
-brie/templates/authentication.html
-brie/templates/debug.html
-brie/templates/error.html
-brie/templates/footer.html
-brie/templates/header.html
+brie/templates/__init__.pyc
 brie/templates/index.html
-brie/templates/login.html
-brie/templates/master.html
-brie/templates/sidebars.html
+brie/templates/login_widget.html
+brie/templates/auth/__init__.py
+brie/templates/auth/__init__.pyc
+brie/templates/auth/login.html
+brie/templates/edit/__init__.py
+brie/templates/edit/__init__.pyc
+brie/templates/edit/error.html
+brie/templates/edit/import_from.html
+brie/templates/edit/member.html
+brie/templates/edit/member_room_interface_edit_views.html
+brie/templates/edit/room.html
+brie/templates/edit/wifi.html
+brie/templates/models/__init__.py
+brie/templates/models/__init__.pyc
+brie/templates/models/about.html
+brie/templates/models/authentication.html
+brie/templates/models/debug.html
+brie/templates/models/error.html
+brie/templates/models/footer.html
+brie/templates/models/header.html
+brie/templates/models/index.html
+brie/templates/models/login.html
+brie/templates/models/master.html
+brie/templates/models/sidebars.html
+brie/templates/rooms/__init__.py
+brie/templates/rooms/__init__.pyc
+brie/templates/rooms/index.html
+brie/templates/show/__init__.py
+brie/templates/show/__init__.pyc
+brie/templates/show/error.html
+brie/templates/show/member.html
+brie/templates/show/member_room_interface_views.html
+brie/templates/show/room.html
 brie/tests/__init__.py
 brie/tests/functional/__init__.py
 brie/tests/functional/test_authentication.py

Brie/brie/config/ldap_config.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-uri = "ldaps://ldap.pacaterie.u-psud.fr"
+uri = "ldaps://172.17.31.4"
 
 base_dn = "dc=pacaterie,dc=u-psud,dc=fr"
 

Brie/brie/controllers/import_actions.py

@@ -104,7 +104,6 @@ class Migration:
 
         member = bind.search_first(ldap_config.username_base_dn, "(uid=" + uid + ")")
 
-        print user.prenom
         print member.dn
 
         machines = DBSession.query(Computer).filter(Computer.iduser == user.iduser)

Brie/brie/lib/ldap_helper.py

@@ -29,10 +29,10 @@ class Ldap(object):
     #end def
 
     def search(self, dn, filter, scope = ldap.SCOPE_SUBTREE):
-#        try:
-        results = self.__connection.search_s(dn, scope, filter)
-#        except:
-#        return None
+        try:
+            results = self.__connection.search_s(dn, scope, filter)
+        except ldap.NO_SUCH_OBJECT:
+            return None
         #end try
 
         ldap_results = []

Brie/development.ini

@@ -36,7 +36,7 @@ beaker.session.secret = somesecret
 # pick the form for your database
 # %(here) may include a ':' character on Windows environments; this can
 # invalidate the URI when specifying a SQLite db via path name
-sqlalchemy.url=postgresql://camembert:CamembertDB%40Pacat@atlas.pacaterie.u-psud.fr:5432/camembert
+sqlalchemy.url=postgresql://camembert:CamembertDB%40Pacat@172.17.22.7:5432/camembert
 # sqlalchemy.url=mysql://username:password@hostname:port/databasename