[open-ils-commits] r91 - in servres/trunk/conifer: . syrup
svn at svn.open-ils.org
svn at svn.open-ils.org
Sat Jan 3 21:47:11 EST 2009
Author: artunit
Date: 2009-01-03 21:47:10 -0500 (Sat, 03 Jan 2009)
New Revision: 91
Added:
servres/trunk/conifer/sample.dat
Modified:
servres/trunk/conifer/syrup/views.py
Log:
Added: servres/trunk/conifer/sample.dat
===================================================================
--- servres/trunk/conifer/sample.dat (rev 0)
+++ servres/trunk/conifer/sample.dat 2009-01-04 02:47:10 UTC (rev 91)
@@ -0,0 +1 @@
+[{"pk": 22, "model": "auth.permission", "fields": {"codename": "add_logentry", "name": "Can add log entry", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_logentry", "name": "Can change log entry", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_logentry", "name": "Can delete log entry", "content_type": 8}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 9, "model": "auth.permission", "fields": {"codename": "delete_user", "name": "Can delete user", "content_type": 3}}, {"pk": 13, "model": "auth.permission", "fields": {"codename": "add_contenttype", "name": "Can add content type", "content_type": 5}}, {"pk": 14, "model": "auth.permission", "fields": {"codename": "change_contenttype", "name": "Can change content type", "content_type": 5}}, {"pk": 15, "model": "auth.permission", "fields": {"codename": "delete_contenttype", "name": "Can delete content type", "content_type": 5}}, {"pk": 16, "model": "auth.permission", "fields": {"codename": "add_session", "name": "Can add session", "content_type": 6}}, {"pk": 17, "model": "auth.permission", "fields": {"codename": "change_session", "name": "Can change session", "content_type": 6}}, {"pk": 18, "model": "auth.permission", "fields": {"codename": "delete_session", "name": "Can delete session", "content_type": 6}}, {"pk": 19, "model": "auth.permission", "fields": {"codename": "add_site", "name": "Can add site", "content_type": 7}}, {"pk": 20, "model": "auth.permission", "fields": {"codename": "change_site", "name": "Can change site", "content_type": 7}}, {"pk": 21, "model": "auth.permission", "fields": {"codename": "delete_site", "name": "Can delete site", "content_type": 7}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_course", "name": "Can add course", "content_type": 14}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_department", "name": "Can add department", "content_type": 13}}, {"pk": 49, "model": "auth.permission", "fields": {"codename": "add_item", "name": "Can add item", "content_type": 17}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_libraryunit", "name": "Can add library unit", "content_type": 10}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_member", "name": "Can add member", "content_type": 15}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "add_newsitem", "name": "Can add news item", "content_type": 16}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_servicedesk", "name": "Can add service desk", "content_type": 11}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_term", "name": "Can add term", "content_type": 12}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_userprofile", "name": "Can add user profile", "content_type": 9}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_course", "name": "Can change course", "content_type": 14}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_department", "name": "Can change department", "content_type": 13}}, {"pk": 50, "model": "auth.permission", "fields": {"codename": "change_item", "name": "Can change item", "content_type": 17}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_libraryunit", "name": "Can change library unit", "content_type": 10}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_member", "name": "Can change member", "content_type": 15}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "change_newsitem", "name": "Can change news item", "content_type": 16}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_servicedesk", "name": "Can change service desk", "content_type": 11}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_term", "name": "Can change term", "content_type": 12}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_userprofile", "name": "Can change user profile", "content_type": 9}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_course", "name": "Can delete course", "content_type": 14}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_department", "name": "Can delete department", "content_type": 13}}, {"pk": 51, "model": "auth.permission", "fields": {"codename": "delete_item", "name": "Can delete item", "content_type": 17}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_libraryunit", "name": "Can delete library unit", "content_type": 10}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_member", "name": "Can delete member", "content_type": 15}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_newsitem", "name": "Can delete news item", "content_type": 16}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_servicedesk", "name": "Can delete service desk", "content_type": 11}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_term", "name": "Can delete term", "content_type": 12}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_userprofile", "name": "Can delete user profile", "content_type": 9}}, {"pk": 1, "model": "auth.user", "fields": {"username": "test", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2009-01-02 16:43:19", "groups": [], "user_permissions": [], "password": "sha1$229bd$8aaf67f54e89b7b08cb225ffda299cb0090fb9eb", "email": "test at test.org", "date_joined": "2008-11-20 23:34:03"}}, {"pk": 2, "model": "auth.user", "fields": {"username": "ping", "first_name": "", "last_name": "", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2008-11-24 13:45:34", "groups": [], "user_permissions": [], "password": "sha1$70d72$e3adfe7fe780b6c220c68e0ec877070ebfa13ab1", "email": "", "date_joined": "2008-11-24 13:45:34"}}, {"pk": 3, "model": "auth.user", "fields": {"username": "billy", "first_name": "billy", "last_name": "test", "is_active": true, "is_superuser": false, "is_staff": true, "last_login": "2008-11-24 15:29:19", "groups": [], "user_permissions": [22, 23, 24, 4, 10, 1, 7, 5, 11, 2, 8, 6, 12, 3, 9, 13, 14, 15, 16, 17, 18, 19, 20, 21, 40, 37, 28, 43, 46, 31, 34, 25, 41, 38, 29, 44, 47, 32, 35, 26, 42, 39, 30, 45, 48, 33, 36, 27], "password": "sha1$258bc$1a76dd9484e36bbbb2fa3ad0df260d21b122f0c9", "email": "billy at test.org", "date_joined": "2008-11-24 15:04:04"}}, {"pk": 4, "model": "auth.user", "fields": {"username": "test1", "first_name": "test1", "last_name": "test 1", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2008-12-16 13:28:54", "groups": [], "user_permissions": [], "password": "sha1$db545$c2aee0a47444adb26b32ac7560df6b816774003a", "email": "test1 at test.org", "date_joined": "2008-12-16 13:28:54"}}, {"pk": 5, "model": "auth.user", "fields": {"username": "test2", "first_name": "test2", "last_name": "test 2", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2008-12-16 13:29:05", "groups": [], "user_permissions": [], "password": "sha1$c3b1e$c1fd1a170123015ee8c6bcbb5b435f4ca1495853", "email": "test2 at test.org", "date_joined": "2008-12-16 13:29:05"}}, {"pk": 6, "model": "auth.user", "fields": {"username": "test3", "first_name": "test3", "last_name": "test 3", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2008-12-16 13:29:13", "groups": [], "user_permissions": [], "password": "sha1$c0e67$11550d7a8ea1d0d2bfea423c35e3dd571011bbd6", "email": "test3 at test.org", "date_joined": "2008-12-16 13:29:13"}}, {"pk": 7, "model": "auth.user", "fields": {"username": "test4", "first_name": "test4", "last_name": "test 4", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2008-12-16 13:29:20", "groups": [], "user_permissions": [], "password": "sha1$f24b6$2c789995468baa40625f026fbca9c640c6cc0145", "email": "test4 at test.org", "date_joined": "2008-12-16 13:29:20"}}, {"pk": 8, "model": "auth.user", "fields": {"username": "test5", "first_name": "test5", "last_name": "test 5", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2008-12-16 13:29:26", "groups": [], "user_permissions": [], "password": "sha1$0acba$76ef04eed7dded54f8513a39aa28428244e9f588", "email": "test5 at test.org", "date_joined": "2008-12-16 13:29:26"}}, {"pk": 9, "model": "auth.user", "fields": {"username": "test6", "first_name": "test6", "last_name": "test 6", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2008-12-16 13:29:33", "groups": [], "user_permissions": [], "password": "sha1$79803$c5a07c8d79872960e75ff573b40e88bf17cf8a7f", "email": "test6 at test.org", "date_joined": "2008-12-16 13:29:33"}}, {"pk": 10, "model": "auth.user", "fields": {"username": "test7", "first_name": "test7", "last_name": "test 7", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2008-12-16 13:29:41", "groups": [], "user_permissions": [], "password": "sha1$ee081$55d45b502aeb7427269e4b43162406996a938341", "email": "test7 at test.org", "date_joined": "2008-12-16 13:29:41"}}, {"pk": 5, "model": "contenttypes.contenttype", "fields": {"model": "contenttype", "name": "content type", "app_label": "contenttypes"}}, {"pk": 14, "model": "contenttypes.contenttype", "fields": {"model": "course", "name": "course", "app_label": "syrup"}}, {"pk": 13, "model": "contenttypes.contenttype", "fields": {"model": "department", "name": "department", "app_label": "syrup"}}, {"pk": 2, "model": "contenttypes.contenttype", "fields": {"model": "group", "name": "group", "app_label": "auth"}}, {"pk": 17, "model": "contenttypes.contenttype", "fields": {"model": "item", "name": "item", "app_label": "syrup"}}, {"pk": 10, "model": "contenttypes.contenttype", "fields": {"model": "libraryunit", "name": "library unit", "app_label": "syrup"}}, {"pk": 8, "model": "contenttypes.contenttype", "fields": {"model": "logentry", "name": "log entry", "app_label": "admin"}}, {"pk": 15, "model": "contenttypes.contenttype", "fields": {"model": "member", "name": "member", "app_label": "syrup"}}, {"pk": 4, "model": "contenttypes.contenttype", "fields": {"model": "message", "name": "message", "app_label": "auth"}}, {"pk": 16, "model": "contenttypes.contenttype", "fields": {"model": "newsitem", "name": "news item", "app_label": "syrup"}}, {"pk": 1, "model": "contenttypes.contenttype", "fields": {"model": "permission", "name": "permission", "app_label": "auth"}}, {"pk": 11, "model": "contenttypes.contenttype", "fields": {"model": "servicedesk", "name": "service desk", "app_label": "syrup"}}, {"pk": 6, "model": "contenttypes.contenttype", "fields": {"model": "session", "name": "session", "app_label": "sessions"}}, {"pk": 7, "model": "contenttypes.contenttype", "fields": {"model": "site", "name": "site", "app_label": "sites"}}, {"pk": 12, "model": "contenttypes.contenttype", "fields": {"model": "term", "name": "term", "app_label": "syrup"}}, {"pk": 3, "model": "contenttypes.contenttype", "fields": {"model": "user", "name": "user", "app_label": "auth"}}, {"pk": 9, "model": "contenttypes.contenttype", "fields": {"model": "userprofile", "name": "user profile", "app_label": "syrup"}}, {"pk": "e7ecfa18455e44498eb62989675f3ac4", "model": "sessions.session", "fields": {"expire_date": "2008-12-04 23:38:16", "session_data": "gAJ9cQEoVRJfYXV0aF91c2VyX2JhY2tlbmRxAlUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5k\ncy5Nb2RlbEJhY2tlbmRxA1UNX2F1dGhfdXNlcl9pZHEESwF1LjM2M2RiYTBjN2Y3NmEzMjFmN2Mw\nMGY3NGIwMzQxYzRj\n"}}, {"pk": "aa1ed775e368f86a56fb712d0de9eff8", "model": "sessions.session", "fields": {"expire_date": "2008-12-10 20:27:04", "session_data": "gAJ9cQEoVRJfYXV0aF91c2VyX2JhY2tlbmRxAlUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5k\ncy5Nb2RlbEJhY2tlbmRxA1UNX2F1dGhfdXNlcl9pZHEESwF1LjM2M2RiYTBjN2Y3NmEzMjFmN2Mw\nMGY3NGIwMzQxYzRj\n"}}, {"pk": "a0a9af88244bb22012652c53131724b2", "model": "sessions.session", "fields": {"expire_date": "2008-12-22 11:45:23", "session_data": "gAJ9cQEoVRJfYXV0aF91c2VyX2JhY2tlbmRxAlUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5k\ncy5Nb2RlbEJhY2tlbmRxA1UNX2F1dGhfdXNlcl9pZHEESwF1LjM2M2RiYTBjN2Y3NmEzMjFmN2Mw\nMGY3NGIwMzQxYzRj\n"}}, {"pk": "6c4c671475d3b1df141df53bc0b4d68e", "model": "sessions.session", "fields": {"expire_date": "2009-01-16 16:43:19", "session_data": "gAJ9cQEoVRJfYXV0aF91c2VyX2JhY2tlbmRxAlUpZGphbmdvLmNvbnRyaWIuYXV0aC5iYWNrZW5k\ncy5Nb2RlbEJhY2tlbmRxA1UNX2F1dGhfdXNlcl9pZHEESwF1LjM2M2RiYTBjN2Y3NmEzMjFmN2Mw\nMGY3NGIwMzQxYzRj\n"}}, {"pk": 1, "model": "sites.site", "fields": {"domain": "example.com", "name": "example.com"}}, {"pk": 45, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:54:36", "object_repr": "test7--INSTR--1020", "object_id": "8", "change_message": "", "user": 1, "content_type": 15}}, {"pk": 44, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:54:24", "object_repr": "test6--INSTR--1020", "object_id": "7", "change_message": "", "user": 1, "content_type": 15}}, {"pk": 43, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:54:13", "object_repr": "test5--INSTR--1020", "object_id": "6", "change_message": "", "user": 1, "content_type": 15}}, {"pk": 42, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:54:01", "object_repr": "test4--INSTR--1020", "object_id": "5", "change_message": "", "user": 1, "content_type": 15}}, {"pk": 41, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:53:44", "object_repr": "test2--INSTR--1020", "object_id": "4", "change_message": "", "user": 1, "content_type": 15}}, {"pk": 40, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:53:17", "object_repr": "test1", "object_id": "4", "change_message": "Changed last_name.", "user": 1, "content_type": 3}}, {"pk": 39, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:52:17", "object_repr": "test3--INSTR--1020", "object_id": "3", "change_message": "", "user": 1, "content_type": 15}}, {"pk": 38, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:45:12", "object_repr": "test1--INSTR--1020", "object_id": "2", "change_message": "", "user": 1, "content_type": 15}}, {"pk": 37, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:40:26", "object_repr": "test1", "object_id": "4", "change_message": "Changed is_staff.", "user": 1, "content_type": 3}}, {"pk": 36, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:39:20", "object_repr": "test1", "object_id": "4", "change_message": "Changed is_staff.", "user": 1, "content_type": 3}}, {"pk": 35, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:36:32", "object_repr": "test1", "object_id": "4", "change_message": "Changed last_name.", "user": 1, "content_type": 3}}, {"pk": 34, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:34:18", "object_repr": "UserProfile(test7)", "object_id": "8", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 33, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:34:07", "object_repr": "UserProfile(test6)", "object_id": "7", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 32, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:33:56", "object_repr": "UserProfile(test5)", "object_id": "6", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 31, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:33:44", "object_repr": "UserProfile(test4)", "object_id": "5", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 30, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:33:33", "object_repr": "UserProfile(test3)", "object_id": "4", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 29, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:33:22", "object_repr": "UserProfile(test2)", "object_id": "3", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 28, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:33:11", "object_repr": "UserProfile(test1)", "object_id": "2", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 27, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:32:47", "object_repr": "test7", "object_id": "10", "change_message": "Changed first_name, last_name and email.", "user": 1, "content_type": 3}}, {"pk": 26, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:32:31", "object_repr": "test6", "object_id": "9", "change_message": "Changed first_name, last_name and email.", "user": 1, "content_type": 3}}, {"pk": 25, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:32:10", "object_repr": "test5", "object_id": "8", "change_message": "Changed first_name, last_name and email.", "user": 1, "content_type": 3}}, {"pk": 24, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:31:55", "object_repr": "test4", "object_id": "7", "change_message": "Changed first_name, last_name and email.", "user": 1, "content_type": 3}}, {"pk": 23, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:31:39", "object_repr": "test3", "object_id": "6", "change_message": "Changed first_name, last_name and email.", "user": 1, "content_type": 3}}, {"pk": 22, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:31:19", "object_repr": "test2", "object_id": "5", "change_message": "Changed first_name, last_name and email.", "user": 1, "content_type": 3}}, {"pk": 21, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-16 13:31:01", "object_repr": "test1", "object_id": "4", "change_message": "Changed first_name, last_name and email.", "user": 1, "content_type": 3}}, {"pk": 20, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:29:41", "object_repr": "test7", "object_id": "10", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 19, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:29:33", "object_repr": "test6", "object_id": "9", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 18, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:29:26", "object_repr": "test5", "object_id": "8", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 17, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:29:20", "object_repr": "test4", "object_id": "7", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 16, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:29:13", "object_repr": "test3", "object_id": "6", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 15, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:29:05", "object_repr": "test2", "object_id": "5", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 14, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-16 13:28:54", "object_repr": "test1", "object_id": "4", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 13, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-12-08 11:21:06", "object_repr": "billy the kid", "object_id": "1", "change_message": "Changed item_type, title and author.", "user": 1, "content_type": 17}}, {"pk": 12, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-04 14:29:02", "object_repr": "NewsItem object", "object_id": "1", "change_message": "", "user": 1, "content_type": 16}}, {"pk": 11, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-12-01 07:25:36", "object_repr": "billy--INSTR--1020", "object_id": "1", "change_message": "", "user": 1, "content_type": 15}}, {"pk": 10, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-28 09:35:20", "object_repr": "billy", "object_id": "1", "change_message": "", "user": 1, "content_type": 17}}, {"pk": 9, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-28 09:34:24", "object_repr": "1020", "object_id": "1", "change_message": "", "user": 1, "content_type": 14}}, {"pk": 8, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-28 09:34:09", "object_repr": "spring", "object_id": "1", "change_message": "", "user": 1, "content_type": 12}}, {"pk": 7, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 15:32:07", "object_repr": "UserProfile(billy)", "object_id": "1", "change_message": "", "user": 1, "content_type": 9}}, {"pk": 6, "model": "admin.logentry", "fields": {"action_flag": 2, "action_time": "2008-11-24 15:04:45", "object_repr": "billy", "object_id": "3", "change_message": "Changed first_name, last_name, email, is_staff and user_permissions.", "user": 1, "content_type": 3}}, {"pk": 5, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 15:04:04", "object_repr": "billy", "object_id": "3", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 4, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 15:02:53", "object_repr": "Ancient Socks", "object_id": "1", "change_message": "", "user": 1, "content_type": 13}}, {"pk": 3, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 15:02:33", "object_repr": "test1", "object_id": "2", "change_message": "", "user": 1, "content_type": 10}}, {"pk": 2, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-24 13:45:34", "object_repr": "ping", "object_id": "2", "change_message": "", "user": 1, "content_type": 3}}, {"pk": 1, "model": "admin.logentry", "fields": {"action_flag": 1, "action_time": "2008-11-23 22:48:24", "object_repr": "testing", "object_id": "1", "change_message": "", "user": 1, "content_type": 10}}, {"pk": 1, "model": "syrup.userprofile", "fields": {"home_address": "", "access_level": null, "user": 3, "home_phone": "444-4444", "active": true, "ils_userid": "", "instructor": true, "proxy": false}}, {"pk": 2, "model": "syrup.userprofile", "fields": {"home_address": "", "access_level": null, "user": 4, "home_phone": "", "active": true, "ils_userid": "", "instructor": true, "proxy": false}}, {"pk": 3, "model": "syrup.userprofile", "fields": {"home_address": "", "access_level": null, "user": 5, "home_phone": "", "active": true, "ils_userid": "", "instructor": true, "proxy": false}}, {"pk": 4, "model": "syrup.userprofile", "fields": {"home_address": "", "access_level": null, "user": 6, "home_phone": "", "active": true, "ils_userid": "", "instructor": true, "proxy": false}}, {"pk": 5, "model": "syrup.userprofile", "fields": {"home_address": "", "access_level": null, "user": 7, "home_phone": "", "active": true, "ils_userid": "", "instructor": true, "proxy": false}}, {"pk": 6, "model": "syrup.userprofile", "fields": {"home_address": "", "access_level": null, "user": 8, "home_phone": "", "active": true, "ils_userid": "", "instructor": true, "proxy": false}}, {"pk": 7, "model": "syrup.userprofile", "fields": {"home_address": "", "access_level": null, "user": 9, "home_phone": "", "active": true, "ils_userid": "", "instructor": true, "proxy": false}}, {"pk": 8, "model": "syrup.userprofile", "fields": {"home_address": "", "access_level": null, "user": 10, "home_phone": "", "active": true, "ils_userid": "", "instructor": true, "proxy": false}}, {"pk": 1, "model": "syrup.libraryunit", "fields": {"url": "http://www.testing.org/", "contact_email": "testing at testing.org", "nickname": "testing", "name": "testing"}}, {"pk": 2, "model": "syrup.libraryunit", "fields": {"url": "http://test.net/", "contact_email": "test at org.net", "nickname": "testing", "name": "test1"}}, {"pk": 1, "model": "syrup.term", "fields": {"start": "2008-11-28", "code": "spring", "name": "spring semester", "finish": "2008-12-31"}}, {"pk": 1, "model": "syrup.department", "fields": {"abbreviation": "socks", "active": true, "name": "Ancient Socks"}}, {"pk": 1, "model": "syrup.course", "fields": {"term": 1, "code": "1020", "title": "socks and shirts", "enrol_codes": "", "active": true, "moderated": false, "department": 1}}, {"pk": 1, "model": "syrup.member", "fields": {"course": 1, "role": "INSTR", "user": 3}}, {"pk": 2, "model": "syrup.member", "fields": {"course": 1, "role": "INSTR", "user": 4}}, {"pk": 3, "model": "syrup.member", "fields": {"course": 1, "role": "INSTR", "user": 6}}, {"pk": 4, "model": "syrup.member", "fields": {"course": 1, "role": "INSTR", "user": 5}}, {"pk": 5, "model": "syrup.member", "fields": {"course": 1, "role": "INSTR", "user": 7}}, {"pk": 6, "model": "syrup.member", "fields": {"course": 1, "role": "INSTR", "user": 8}}, {"pk": 7, "model": "syrup.member", "fields": {"course": 1, "role": "INSTR", "user": 9}}, {"pk": 8, "model": "syrup.member", "fields": {"course": 1, "role": "INSTR", "user": 10}}, {"pk": 1, "model": "syrup.item", "fields": {"parent_heading": null, "performer": "", "isbn": "", "course": 1, "sort_order": 0, "activation_date": "2008-11-28", "oclc": "", "local_control_key": "", "requested_loan_period": "", "call_number": "", "author": "billy and bob: the untold story of billy bob", "source": "", "volume_title": "", "pages_times": "", "mime_type": "text/html", "barcode": "", "volume_edition": "", "last_modified": "2008-11-28 09:35:09", "content_notes": "", "fileobj": "", "home_library": 1, "issn": "", "url": "", "expiration_date": null, "title": "billy the kid", "item_type": "PHYS", "phys_status": "ACTIVE", "date_created": "2008-11-28 09:35:20"}}, {"pk": 1, "model": "syrup.newsitem", "fields": {"body": "The Library is pleased to announce that new funding has come through for constructing a new building. This will realize the architecture put forward in the recent visioning exercise.", "published": "2008-12-04 14:27:16", "encoding": "html", "subject": "Library receives funding for new building"}}]
Modified: servres/trunk/conifer/syrup/views.py
===================================================================
--- servres/trunk/conifer/syrup/views.py 2009-01-02 22:03:23 UTC (rev 90)
+++ servres/trunk/conifer/syrup/views.py 2009-01-04 02:47:10 UTC (rev 91)
@@ -213,6 +213,11 @@
print term
'''
+ #not sure this would be the best way but locals() would be cleaner
+ #can this be done with genshi?
+ '''
+ return g.render('search_results.xhtml', locals())
+ '''
return g.render('search_results.xhtml', paginator=paginator,
page_num=page_num,
count=count, query_string=query_string,
More information about the open-ils-commits
mailing list