git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d31e5fd
)
- return peer_id, peer_person_id
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 29 Mar 2007 13:17:09 +0000
(13:17 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 29 Mar 2007 13:17:09 +0000
(13:17 +0000)
PLC/Persons.py
patch
|
blob
|
history
diff --git
a/PLC/Persons.py
b/PLC/Persons.py
index
e7057f1
..
7e7578e
100644
(file)
--- a/
PLC/Persons.py
+++ b/
PLC/Persons.py
@@
-4,7
+4,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Persons.py,v 1.3
3 2007/01/16 17:05:41 mlhuang
Exp $
+# $Id: Persons.py,v 1.3
4 2007/03/28 19:15:34 tmack
Exp $
#
from types import StringTypes
#
from types import StringTypes
@@
-246,8
+246,7
@@
class Persons(Table):
'slice_ids': ('slice_id', 'slice_person')
}
foreign_keys = {}
'slice_ids': ('slice_id', 'slice_person')
}
foreign_keys = {}
- db_fields = Person(api, Person.fields).db_fields().keys() + \
- ['last_updated', 'date_created', 'password', 'verification_key', 'verification_expires']
+ db_fields = filter(lambda field: field not in foreign_fields.keys(), Person.fields.keys())
all_fields = db_fields + [value[0] for value in foreign_fields.values()]
fields = []
_select = "SELECT "
all_fields = db_fields + [value[0] for value in foreign_fields.values()]
fields = []
_select = "SELECT "