Changeset 1507:6edaa6b22268

Timestamp:

03/09/10 21:20:34 (5 months ago)

Author:

Ferllings <cedric@…>

Branch:

default

Message:

merge

Location:

src/domogik/ui/djangodomo/core

Files:

• models.py (modified) (2 diffs)
• views.py (modified) (2 diffs)

src/domogik/ui/djangodomo/core/models.py

@@ -219 +219 @@
 class Accounts(pipes.DmgPipe):
     uri = "http://127.0.0.1:8080/account"
-    
+
+    @staticmethod
+    def Auth(login, password):
+        resp = Accounts.objects.get({'parameters':"auth/" + login + "/" + password})
+        if resp :
+            return resp
+        
     @staticmethod
     def getAllUsers():
@@ -225 +231 @@
         if resp :
             return resp
-    
-    @staticmethod
-    def Auth(login, password):
-        resp = Accounts.objects.get({'parameters':"auth/" + login + "/" + password})
-        if resp :
-            return resp
+
+    @staticmethod
+    def getAllPeoples():
+        resp = Accounts.objects.get({'parameters':"person/list/"})
+        if resp :
+            return resp  

src/domogik/ui/djangodomo/core/views.py

@@ -319 +319 @@
     try:
         resultAllAccounts = Accounts.getAllUsers()
+        resultAllPeoples = Accounts.getAllPeoples()
     except ResourceNotAvailableException:
         return render_to_response('error/ResourceNotAvailableException.html')
@@ -329 +330 @@
         status=status,
         msg=msg,
-        accounts_list=resultAllAccounts.account
+        accounts_list=resultAllAccounts.account,
+        peoples_list=resultAllPeoples.person
     )