From 00434d819aba334cc8e93c4c0c329232320e7789 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 18 Nov 2011 15:59:09 +0100 Subject: [PATCH 1/4] Added fixtures files for the demo application. see #187 --- admin/fixtures/demo.json | 1 + lib/fixtures/demo.json | 1 + 2 files changed, 2 insertions(+) create mode 100644 admin/fixtures/demo.json create mode 100644 lib/fixtures/demo.json diff --git a/admin/fixtures/demo.json b/admin/fixtures/demo.json new file mode 100644 index 000000000..9f087c593 --- /dev/null +++ b/admin/fixtures/demo.json @@ -0,0 +1 @@ +[{"pk": 1, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 15:44:48", "last_modification": "2011-11-18 15:44:48"}}, {"pk": 2, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 15:45:16", "last_modification": "2011-11-18 15:45:16"}}, {"pk": 3, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 15:46:10", "last_modification": "2011-11-18 15:46:10"}}, {"pk": 1, "model": "admin.domain", "fields": {"dates": 1, "enabled": true, "name": "demo.local", "quota": 10}}, {"pk": 1, "model": "admin.mailbox", "fields": {"dates": 2, "uid": 1001, "quota": 10, "gid": 1001, "user": 2, "domain": 1, "address": "user", "path": "user/", "password": "lGBs866k5gQew", "name": "Test user"}}, {"pk": 2, "model": "admin.mailbox", "fields": {"dates": 3, "uid": 1001, "quota": 10, "gid": 1001, "user": 3, "domain": 1, "address": "admin", "path": "admin/", "password": "SmjOmOSmBS/JI", "name": "Test domain admin"}}, {"pk": 1, "model": "admin.extension", "fields": {"enabled": true, "name": "stats"}}, {"pk": 2, "model": "admin.extension", "fields": {"enabled": true, "name": "sievefilters"}}, {"pk": 3, "model": "admin.extension", "fields": {"enabled": true, "name": "amavis_quarantine"}}, {"pk": 4, "model": "admin.extension", "fields": {"enabled": true, "name": "postfix_autoreply"}}, {"pk": 5, "model": "admin.extension", "fields": {"enabled": true, "name": "webmail"}}] \ No newline at end of file diff --git a/lib/fixtures/demo.json b/lib/fixtures/demo.json new file mode 100644 index 000000000..2917be2f4 --- /dev/null +++ b/lib/fixtures/demo.json @@ -0,0 +1 @@ +[{"pk": 1, "model": "lib.parameter", "fields": {"name": "stats.IMG_ROOTDIR", "value": "/srv/www/modoboa/static/stats"}}, {"pk": 2, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SECURED", "value": "no"}}, {"pk": 3, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_PORT", "value": "9998"}}, {"pk": 4, "model": "lib.parameter", "fields": {"name": "postfix_autoreply.AUTOREPLIES_TIMEOUT", "value": "86400"}}, {"pk": 5, "model": "lib.parameter", "fields": {"name": "sievefilters.AUTHENTICATION_MECH", "value": "AUTO"}}, {"pk": 6, "model": "lib.parameter", "fields": {"name": "general.DEFAULT_TOP_REDIRECTION", "value": "userprefs"}}, {"pk": 7, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_SOCKET", "value": "/var/amavis/amavisd.sock"}}, {"pk": 8, "model": "lib.parameter", "fields": {"name": "auth.SECRET_KEY", "value": "abcdefghijklmnop"}}, {"pk": 9, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_MODE", "value": "inet"}}, {"pk": 10, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_PORT", "value": "143"}}, {"pk": 11, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SECURED_MODE", "value": "none"}}, {"pk": 12, "model": "lib.parameter", "fields": {"name": "admin.STORAGE_PATH", "value": "/srv/vmail"}}, {"pk": 13, "model": "lib.parameter", "fields": {"name": "admin.ITEMS_PER_PAGE", "value": "30"}}, {"pk": 14, "model": "lib.parameter", "fields": {"name": "sievefilters.SERVER", "value": "127.0.0.1"}}, {"pk": 15, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_SERVER", "value": "127.0.0.1"}}, {"pk": 16, "model": "lib.parameter", "fields": {"name": "webmail.MAX_ATTACHMENT_SIZE", "value": "2048"}}, {"pk": 17, "model": "lib.parameter", "fields": {"name": "stats.RRD_ROOTDIR", "value": "/srv/www/modoboa/tmp"}}, {"pk": 18, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.RELEASED_MSGS_CLEANUP", "value": "no"}}, {"pk": 19, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_UID", "value": "vmail"}}, {"pk": 20, "model": "lib.parameter", "fields": {"name": "admin.MAILDIR_ROOT", "value": ".maildir"}}, {"pk": 21, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.MAX_MESSAGES_AGE", "value": "14"}}, {"pk": 22, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_PORT", "value": "25"}}, {"pk": 23, "model": "lib.parameter", "fields": {"name": "webmail.SMTP_AUTHENTICATION", "value": "no"}}, {"pk": 24, "model": "lib.parameter", "fields": {"name": "admin.PASSWORD_SCHEME", "value": "crypt"}}, {"pk": 25, "model": "lib.parameter", "fields": {"name": "webmail.IMAP_SERVER", "value": "127.0.0.1"}}, {"pk": 26, "model": "lib.parameter", "fields": {"name": "admin.CREATE_DIRECTORIES", "value": "yes"}}, {"pk": 27, "model": "lib.parameter", "fields": {"name": "amavis_quarantine.AM_PDP_HOST", "value": "localhost"}}, {"pk": 28, "model": "lib.parameter", "fields": {"name": "admin.MAILBOX_TYPE", "value": "maildir"}}, {"pk": 29, "model": "lib.parameter", "fields": {"name": "sievefilters.PORT", "value": "2000"}}, {"pk": 30, "model": "lib.parameter", "fields": {"name": "admin.VIRTUAL_GID", "value": "vmail"}}, {"pk": 31, "model": "lib.parameter", "fields": {"name": "sievefilters.STARTTLS", "value": "no"}}, {"pk": 32, "model": "lib.parameter", "fields": {"name": "stats.LOGFILE", "value": "/var/log/mail.log"}}] \ No newline at end of file From fe46cb7d525d9a92e66b2cf211c2f23c0f1c4396 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 18 Nov 2011 16:09:01 +0100 Subject: [PATCH 2/4] With data from the 'auth' application, it works better :p see #187 --- admin/fixtures/demo.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/fixtures/demo.json b/admin/fixtures/demo.json index 9f087c593..0befc7fef 100644 --- a/admin/fixtures/demo.json +++ b/admin/fixtures/demo.json @@ -1 +1 @@ -[{"pk": 1, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 15:44:48", "last_modification": "2011-11-18 15:44:48"}}, {"pk": 2, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 15:45:16", "last_modification": "2011-11-18 15:45:16"}}, {"pk": 3, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 15:46:10", "last_modification": "2011-11-18 15:46:10"}}, {"pk": 1, "model": "admin.domain", "fields": {"dates": 1, "enabled": true, "name": "demo.local", "quota": 10}}, {"pk": 1, "model": "admin.mailbox", "fields": {"dates": 2, "uid": 1001, "quota": 10, "gid": 1001, "user": 2, "domain": 1, "address": "user", "path": "user/", "password": "lGBs866k5gQew", "name": "Test user"}}, {"pk": 2, "model": "admin.mailbox", "fields": {"dates": 3, "uid": 1001, "quota": 10, "gid": 1001, "user": 3, "domain": 1, "address": "admin", "path": "admin/", "password": "SmjOmOSmBS/JI", "name": "Test domain admin"}}, {"pk": 1, "model": "admin.extension", "fields": {"enabled": true, "name": "stats"}}, {"pk": 2, "model": "admin.extension", "fields": {"enabled": true, "name": "sievefilters"}}, {"pk": 3, "model": "admin.extension", "fields": {"enabled": true, "name": "amavis_quarantine"}}, {"pk": 4, "model": "admin.extension", "fields": {"enabled": true, "name": "postfix_autoreply"}}, {"pk": 5, "model": "admin.extension", "fields": {"enabled": true, "name": "webmail"}}] \ No newline at end of file +[{"pk": 1, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:04", "last_modification": "2011-11-18 16:05:04"}}, {"pk": 2, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:28", "last_modification": "2011-11-18 16:05:28"}}, {"pk": 3, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:48", "last_modification": "2011-11-18 16:05:48"}}, {"pk": 1, "model": "admin.domain", "fields": {"dates": 1, "enabled": true, "name": "demo.local", "quota": 10}}, {"pk": 1, "model": "admin.mailbox", "fields": {"dates": 2, "uid": 1001, "quota": 10, "gid": 1001, "user": 2, "domain": 1, "address": "admin", "path": "admin/", "password": "ZJ.4/pUbTNnU.", "name": "Test domain admin"}}, {"pk": 2, "model": "admin.mailbox", "fields": {"dates": 3, "uid": 1001, "quota": 10, "gid": 1001, "user": 3, "domain": 1, "address": "user", "path": "user/", "password": "hqbHWUnOQFELM", "name": "Test user"}}, {"pk": 1, "model": "admin.extension", "fields": {"enabled": true, "name": "stats"}}, {"pk": 2, "model": "admin.extension", "fields": {"enabled": true, "name": "sievefilters"}}, {"pk": 3, "model": "admin.extension", "fields": {"enabled": true, "name": "amavis_quarantine"}}, {"pk": 4, "model": "admin.extension", "fields": {"enabled": true, "name": "postfix_autoreply"}}, {"pk": 5, "model": "admin.extension", "fields": {"enabled": true, "name": "webmail"}}, {"pk": 72, "model": "auth.permission", "fields": {"codename": "add_alias", "name": "Can add alias", "content_type": 23}}, {"pk": 73, "model": "auth.permission", "fields": {"codename": "change_alias", "name": "Can change alias", "content_type": 23}}, {"pk": 74, "model": "auth.permission", "fields": {"codename": "delete_alias", "name": "Can delete alias", "content_type": 23}}, {"pk": 75, "model": "auth.permission", "fields": {"codename": "view_aliases", "name": "View aliases", "content_type": 23}}, {"pk": 59, "model": "auth.permission", "fields": {"codename": "add_domain", "name": "Can add domain", "content_type": 20}}, {"pk": 60, "model": "auth.permission", "fields": {"codename": "change_domain", "name": "Can change domain", "content_type": 20}}, {"pk": 61, "model": "auth.permission", "fields": {"codename": "delete_domain", "name": "Can delete domain", "content_type": 20}}, {"pk": 62, "model": "auth.permission", "fields": {"codename": "view_domain", "name": "View domain", "content_type": 20}}, {"pk": 63, "model": "auth.permission", "fields": {"codename": "view_domains", "name": "View domains", "content_type": 20}}, {"pk": 64, "model": "auth.permission", "fields": {"codename": "add_domainalias", "name": "Can add domain alias", "content_type": 21}}, {"pk": 65, "model": "auth.permission", "fields": {"codename": "change_domainalias", "name": "Can change domain alias", "content_type": 21}}, {"pk": 66, "model": "auth.permission", "fields": {"codename": "delete_domainalias", "name": "Can delete domain alias", "content_type": 21}}, {"pk": 67, "model": "auth.permission", "fields": {"codename": "view_domaliases", "name": "View domain aliases", "content_type": 21}}, {"pk": 76, "model": "auth.permission", "fields": {"codename": "add_extension", "name": "Can add extension", "content_type": 24}}, {"pk": 77, "model": "auth.permission", "fields": {"codename": "change_extension", "name": "Can change extension", "content_type": 24}}, {"pk": 78, "model": "auth.permission", "fields": {"codename": "delete_extension", "name": "Can delete extension", "content_type": 24}}, {"pk": 68, "model": "auth.permission", "fields": {"codename": "add_mailbox", "name": "Can add mailbox", "content_type": 22}}, {"pk": 69, "model": "auth.permission", "fields": {"codename": "change_mailbox", "name": "Can change mailbox", "content_type": 22}}, {"pk": 70, "model": "auth.permission", "fields": {"codename": "delete_mailbox", "name": "Can delete mailbox", "content_type": 22}}, {"pk": 71, "model": "auth.permission", "fields": {"codename": "view_mailboxes", "name": "View mailboxes", "content_type": 22}}, {"pk": 56, "model": "auth.permission", "fields": {"codename": "add_objectdates", "name": "Can add object dates", "content_type": 19}}, {"pk": 57, "model": "auth.permission", "fields": {"codename": "change_objectdates", "name": "Can change object dates", "content_type": 19}}, {"pk": 58, "model": "auth.permission", "fields": {"codename": "delete_objectdates", "name": "Can delete object dates", "content_type": 19}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_maddr", "name": "Can add maddr", "content_type": 9}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_maddr", "name": "Can change maddr", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_maddr", "name": "Can delete maddr", "content_type": 9}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_mailaddr", "name": "Can add mailaddr", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_mailaddr", "name": "Can change mailaddr", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_mailaddr", "name": "Can delete mailaddr", "content_type": 10}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_msgrcpt", "name": "Can add msgrcpt", "content_type": 12}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_msgrcpt", "name": "Can change msgrcpt", "content_type": 12}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_msgrcpt", "name": "Can delete msgrcpt", "content_type": 12}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_msgs", "name": "Can add msgs", "content_type": 11}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_msgs", "name": "Can change msgs", "content_type": 11}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_msgs", "name": "Can delete msgs", "content_type": 11}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_policy", "name": "Can add policy", "content_type": 13}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_policy", "name": "Can change policy", "content_type": 13}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_policy", "name": "Can delete policy", "content_type": 13}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_quarantine", "name": "Can add quarantine", "content_type": 14}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_quarantine", "name": "Can change quarantine", "content_type": 14}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_quarantine", "name": "Can delete quarantine", "content_type": 14}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_users", "name": "Can add users", "content_type": 15}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_users", "name": "Can change users", "content_type": 15}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_users", "name": "Can delete users", "content_type": 15}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "add_wblist", "name": "Can add wblist", "content_type": 16}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "change_wblist", "name": "Can change wblist", "content_type": 16}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_wblist", "name": "Can delete wblist", "content_type": 16}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 55, "model": "auth.permission", "fields": {"codename": "view_permissions", "name": "View permissions", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"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": 49, "model": "auth.permission", "fields": {"codename": "add_parameter", "name": "Can add parameter", "content_type": 17}}, {"pk": 50, "model": "auth.permission", "fields": {"codename": "change_parameter", "name": "Can change parameter", "content_type": 17}}, {"pk": 51, "model": "auth.permission", "fields": {"codename": "delete_parameter", "name": "Can delete parameter", "content_type": 17}}, {"pk": 52, "model": "auth.permission", "fields": {"codename": "add_userparameter", "name": "Can add user parameter", "content_type": 18}}, {"pk": 53, "model": "auth.permission", "fields": {"codename": "change_userparameter", "name": "Can change user parameter", "content_type": 18}}, {"pk": 54, "model": "auth.permission", "fields": {"codename": "delete_userparameter", "name": "Can delete user parameter", "content_type": 18}}, {"pk": 82, "model": "auth.permission", "fields": {"codename": "add_alias", "name": "Can add alias", "content_type": 26}}, {"pk": 83, "model": "auth.permission", "fields": {"codename": "change_alias", "name": "Can change alias", "content_type": 26}}, {"pk": 84, "model": "auth.permission", "fields": {"codename": "delete_alias", "name": "Can delete alias", "content_type": 26}}, {"pk": 88, "model": "auth.permission", "fields": {"codename": "add_arhistoric", "name": "Can add a rhistoric", "content_type": 28}}, {"pk": 89, "model": "auth.permission", "fields": {"codename": "change_arhistoric", "name": "Can change a rhistoric", "content_type": 28}}, {"pk": 90, "model": "auth.permission", "fields": {"codename": "delete_arhistoric", "name": "Can delete a rhistoric", "content_type": 28}}, {"pk": 85, "model": "auth.permission", "fields": {"codename": "add_armessage", "name": "Can add a rmessage", "content_type": 27}}, {"pk": 86, "model": "auth.permission", "fields": {"codename": "change_armessage", "name": "Can change a rmessage", "content_type": 27}}, {"pk": 87, "model": "auth.permission", "fields": {"codename": "delete_armessage", "name": "Can delete a rmessage", "content_type": 27}}, {"pk": 79, "model": "auth.permission", "fields": {"codename": "add_transport", "name": "Can add transport", "content_type": 25}}, {"pk": 80, "model": "auth.permission", "fields": {"codename": "change_transport", "name": "Can change transport", "content_type": 25}}, {"pk": 81, "model": "auth.permission", "fields": {"codename": "delete_transport", "name": "Can delete transport", "content_type": 25}}, {"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": 22, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": 8}}, {"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [72, 73, 74, 75, 62, 64, 65, 66, 67, 68, 69, 70, 71]}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2011-11-18 16:04:36", "groups": [], "user_permissions": [], "password": "sha1$6e7b5$10b2f6564eef0eeb8085887b21596865998475f0", "email": "admin@modoboa.state-of-mind.de", "date_joined": "2011-11-18 16:03:39"}}, {"pk": 2, "model": "auth.user", "fields": {"username": "admin@demo.local", "first_name": "Test domain admin", "last_name": "", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2011-11-18 16:05:27", "groups": [1], "user_permissions": [], "password": "!", "email": "admin@demo.local", "date_joined": "2011-11-18 16:06:01"}}, {"pk": 3, "model": "auth.user", "fields": {"username": "user@demo.local", "first_name": "Test", "last_name": "user", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2011-11-18 16:05:48", "groups": [], "user_permissions": [], "password": "!", "email": "user@demo.local", "date_joined": "2011-11-18 16:05:48"}}] \ No newline at end of file From efc024ad93bfa30f4852eaf053a9157f3bb5ac95 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 18 Nov 2011 20:11:26 +0100 Subject: [PATCH 3/4] * Fixed bad uid/gid for demo fixtures (must be 500:500) * Fixed incorrect search pattern to activate the demo applicaton see #187 --- admin/fixtures/demo.json | 2 +- demo/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/admin/fixtures/demo.json b/admin/fixtures/demo.json index 0befc7fef..04720001d 100644 --- a/admin/fixtures/demo.json +++ b/admin/fixtures/demo.json @@ -1 +1 @@ -[{"pk": 1, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:04", "last_modification": "2011-11-18 16:05:04"}}, {"pk": 2, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:28", "last_modification": "2011-11-18 16:05:28"}}, {"pk": 3, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:48", "last_modification": "2011-11-18 16:05:48"}}, {"pk": 1, "model": "admin.domain", "fields": {"dates": 1, "enabled": true, "name": "demo.local", "quota": 10}}, {"pk": 1, "model": "admin.mailbox", "fields": {"dates": 2, "uid": 1001, "quota": 10, "gid": 1001, "user": 2, "domain": 1, "address": "admin", "path": "admin/", "password": "ZJ.4/pUbTNnU.", "name": "Test domain admin"}}, {"pk": 2, "model": "admin.mailbox", "fields": {"dates": 3, "uid": 1001, "quota": 10, "gid": 1001, "user": 3, "domain": 1, "address": "user", "path": "user/", "password": "hqbHWUnOQFELM", "name": "Test user"}}, {"pk": 1, "model": "admin.extension", "fields": {"enabled": true, "name": "stats"}}, {"pk": 2, "model": "admin.extension", "fields": {"enabled": true, "name": "sievefilters"}}, {"pk": 3, "model": "admin.extension", "fields": {"enabled": true, "name": "amavis_quarantine"}}, {"pk": 4, "model": "admin.extension", "fields": {"enabled": true, "name": "postfix_autoreply"}}, {"pk": 5, "model": "admin.extension", "fields": {"enabled": true, "name": "webmail"}}, {"pk": 72, "model": "auth.permission", "fields": {"codename": "add_alias", "name": "Can add alias", "content_type": 23}}, {"pk": 73, "model": "auth.permission", "fields": {"codename": "change_alias", "name": "Can change alias", "content_type": 23}}, {"pk": 74, "model": "auth.permission", "fields": {"codename": "delete_alias", "name": "Can delete alias", "content_type": 23}}, {"pk": 75, "model": "auth.permission", "fields": {"codename": "view_aliases", "name": "View aliases", "content_type": 23}}, {"pk": 59, "model": "auth.permission", "fields": {"codename": "add_domain", "name": "Can add domain", "content_type": 20}}, {"pk": 60, "model": "auth.permission", "fields": {"codename": "change_domain", "name": "Can change domain", "content_type": 20}}, {"pk": 61, "model": "auth.permission", "fields": {"codename": "delete_domain", "name": "Can delete domain", "content_type": 20}}, {"pk": 62, "model": "auth.permission", "fields": {"codename": "view_domain", "name": "View domain", "content_type": 20}}, {"pk": 63, "model": "auth.permission", "fields": {"codename": "view_domains", "name": "View domains", "content_type": 20}}, {"pk": 64, "model": "auth.permission", "fields": {"codename": "add_domainalias", "name": "Can add domain alias", "content_type": 21}}, {"pk": 65, "model": "auth.permission", "fields": {"codename": "change_domainalias", "name": "Can change domain alias", "content_type": 21}}, {"pk": 66, "model": "auth.permission", "fields": {"codename": "delete_domainalias", "name": "Can delete domain alias", "content_type": 21}}, {"pk": 67, "model": "auth.permission", "fields": {"codename": "view_domaliases", "name": "View domain aliases", "content_type": 21}}, {"pk": 76, "model": "auth.permission", "fields": {"codename": "add_extension", "name": "Can add extension", "content_type": 24}}, {"pk": 77, "model": "auth.permission", "fields": {"codename": "change_extension", "name": "Can change extension", "content_type": 24}}, {"pk": 78, "model": "auth.permission", "fields": {"codename": "delete_extension", "name": "Can delete extension", "content_type": 24}}, {"pk": 68, "model": "auth.permission", "fields": {"codename": "add_mailbox", "name": "Can add mailbox", "content_type": 22}}, {"pk": 69, "model": "auth.permission", "fields": {"codename": "change_mailbox", "name": "Can change mailbox", "content_type": 22}}, {"pk": 70, "model": "auth.permission", "fields": {"codename": "delete_mailbox", "name": "Can delete mailbox", "content_type": 22}}, {"pk": 71, "model": "auth.permission", "fields": {"codename": "view_mailboxes", "name": "View mailboxes", "content_type": 22}}, {"pk": 56, "model": "auth.permission", "fields": {"codename": "add_objectdates", "name": "Can add object dates", "content_type": 19}}, {"pk": 57, "model": "auth.permission", "fields": {"codename": "change_objectdates", "name": "Can change object dates", "content_type": 19}}, {"pk": 58, "model": "auth.permission", "fields": {"codename": "delete_objectdates", "name": "Can delete object dates", "content_type": 19}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_maddr", "name": "Can add maddr", "content_type": 9}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_maddr", "name": "Can change maddr", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_maddr", "name": "Can delete maddr", "content_type": 9}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_mailaddr", "name": "Can add mailaddr", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_mailaddr", "name": "Can change mailaddr", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_mailaddr", "name": "Can delete mailaddr", "content_type": 10}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_msgrcpt", "name": "Can add msgrcpt", "content_type": 12}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_msgrcpt", "name": "Can change msgrcpt", "content_type": 12}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_msgrcpt", "name": "Can delete msgrcpt", "content_type": 12}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_msgs", "name": "Can add msgs", "content_type": 11}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_msgs", "name": "Can change msgs", "content_type": 11}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_msgs", "name": "Can delete msgs", "content_type": 11}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_policy", "name": "Can add policy", "content_type": 13}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_policy", "name": "Can change policy", "content_type": 13}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_policy", "name": "Can delete policy", "content_type": 13}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_quarantine", "name": "Can add quarantine", "content_type": 14}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_quarantine", "name": "Can change quarantine", "content_type": 14}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_quarantine", "name": "Can delete quarantine", "content_type": 14}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_users", "name": "Can add users", "content_type": 15}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_users", "name": "Can change users", "content_type": 15}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_users", "name": "Can delete users", "content_type": 15}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "add_wblist", "name": "Can add wblist", "content_type": 16}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "change_wblist", "name": "Can change wblist", "content_type": 16}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_wblist", "name": "Can delete wblist", "content_type": 16}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 55, "model": "auth.permission", "fields": {"codename": "view_permissions", "name": "View permissions", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"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": 49, "model": "auth.permission", "fields": {"codename": "add_parameter", "name": "Can add parameter", "content_type": 17}}, {"pk": 50, "model": "auth.permission", "fields": {"codename": "change_parameter", "name": "Can change parameter", "content_type": 17}}, {"pk": 51, "model": "auth.permission", "fields": {"codename": "delete_parameter", "name": "Can delete parameter", "content_type": 17}}, {"pk": 52, "model": "auth.permission", "fields": {"codename": "add_userparameter", "name": "Can add user parameter", "content_type": 18}}, {"pk": 53, "model": "auth.permission", "fields": {"codename": "change_userparameter", "name": "Can change user parameter", "content_type": 18}}, {"pk": 54, "model": "auth.permission", "fields": {"codename": "delete_userparameter", "name": "Can delete user parameter", "content_type": 18}}, {"pk": 82, "model": "auth.permission", "fields": {"codename": "add_alias", "name": "Can add alias", "content_type": 26}}, {"pk": 83, "model": "auth.permission", "fields": {"codename": "change_alias", "name": "Can change alias", "content_type": 26}}, {"pk": 84, "model": "auth.permission", "fields": {"codename": "delete_alias", "name": "Can delete alias", "content_type": 26}}, {"pk": 88, "model": "auth.permission", "fields": {"codename": "add_arhistoric", "name": "Can add a rhistoric", "content_type": 28}}, {"pk": 89, "model": "auth.permission", "fields": {"codename": "change_arhistoric", "name": "Can change a rhistoric", "content_type": 28}}, {"pk": 90, "model": "auth.permission", "fields": {"codename": "delete_arhistoric", "name": "Can delete a rhistoric", "content_type": 28}}, {"pk": 85, "model": "auth.permission", "fields": {"codename": "add_armessage", "name": "Can add a rmessage", "content_type": 27}}, {"pk": 86, "model": "auth.permission", "fields": {"codename": "change_armessage", "name": "Can change a rmessage", "content_type": 27}}, {"pk": 87, "model": "auth.permission", "fields": {"codename": "delete_armessage", "name": "Can delete a rmessage", "content_type": 27}}, {"pk": 79, "model": "auth.permission", "fields": {"codename": "add_transport", "name": "Can add transport", "content_type": 25}}, {"pk": 80, "model": "auth.permission", "fields": {"codename": "change_transport", "name": "Can change transport", "content_type": 25}}, {"pk": 81, "model": "auth.permission", "fields": {"codename": "delete_transport", "name": "Can delete transport", "content_type": 25}}, {"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": 22, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": 8}}, {"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [72, 73, 74, 75, 62, 64, 65, 66, 67, 68, 69, 70, 71]}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2011-11-18 16:04:36", "groups": [], "user_permissions": [], "password": "sha1$6e7b5$10b2f6564eef0eeb8085887b21596865998475f0", "email": "admin@modoboa.state-of-mind.de", "date_joined": "2011-11-18 16:03:39"}}, {"pk": 2, "model": "auth.user", "fields": {"username": "admin@demo.local", "first_name": "Test domain admin", "last_name": "", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2011-11-18 16:05:27", "groups": [1], "user_permissions": [], "password": "!", "email": "admin@demo.local", "date_joined": "2011-11-18 16:06:01"}}, {"pk": 3, "model": "auth.user", "fields": {"username": "user@demo.local", "first_name": "Test", "last_name": "user", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2011-11-18 16:05:48", "groups": [], "user_permissions": [], "password": "!", "email": "user@demo.local", "date_joined": "2011-11-18 16:05:48"}}] \ No newline at end of file +[{"pk": 1, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:04", "last_modification": "2011-11-18 16:05:04"}}, {"pk": 2, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:28", "last_modification": "2011-11-18 16:05:28"}}, {"pk": 3, "model": "admin.objectdates", "fields": {"creation": "2011-11-18 16:05:48", "last_modification": "2011-11-18 16:05:48"}}, {"pk": 1, "model": "admin.domain", "fields": {"dates": 1, "enabled": true, "name": "demo.local", "quota": 10}}, {"pk": 1, "model": "admin.mailbox", "fields": {"dates": 2, "uid": 500, "quota": 10, "gid": 500, "user": 2, "domain": 1, "address": "admin", "path": "admin/", "password": "ZJ.4/pUbTNnU.", "name": "Test domain admin"}}, {"pk": 2, "model": "admin.mailbox", "fields": {"dates": 3, "uid": 500, "quota": 10, "gid": 500, "user": 3, "domain": 1, "address": "user", "path": "user/", "password": "hqbHWUnOQFELM", "name": "Test user"}}, {"pk": 1, "model": "admin.extension", "fields": {"enabled": true, "name": "stats"}}, {"pk": 2, "model": "admin.extension", "fields": {"enabled": true, "name": "sievefilters"}}, {"pk": 3, "model": "admin.extension", "fields": {"enabled": true, "name": "amavis_quarantine"}}, {"pk": 4, "model": "admin.extension", "fields": {"enabled": true, "name": "postfix_autoreply"}}, {"pk": 5, "model": "admin.extension", "fields": {"enabled": true, "name": "webmail"}}, {"pk": 72, "model": "auth.permission", "fields": {"codename": "add_alias", "name": "Can add alias", "content_type": 23}}, {"pk": 73, "model": "auth.permission", "fields": {"codename": "change_alias", "name": "Can change alias", "content_type": 23}}, {"pk": 74, "model": "auth.permission", "fields": {"codename": "delete_alias", "name": "Can delete alias", "content_type": 23}}, {"pk": 75, "model": "auth.permission", "fields": {"codename": "view_aliases", "name": "View aliases", "content_type": 23}}, {"pk": 59, "model": "auth.permission", "fields": {"codename": "add_domain", "name": "Can add domain", "content_type": 20}}, {"pk": 60, "model": "auth.permission", "fields": {"codename": "change_domain", "name": "Can change domain", "content_type": 20}}, {"pk": 61, "model": "auth.permission", "fields": {"codename": "delete_domain", "name": "Can delete domain", "content_type": 20}}, {"pk": 62, "model": "auth.permission", "fields": {"codename": "view_domain", "name": "View domain", "content_type": 20}}, {"pk": 63, "model": "auth.permission", "fields": {"codename": "view_domains", "name": "View domains", "content_type": 20}}, {"pk": 64, "model": "auth.permission", "fields": {"codename": "add_domainalias", "name": "Can add domain alias", "content_type": 21}}, {"pk": 65, "model": "auth.permission", "fields": {"codename": "change_domainalias", "name": "Can change domain alias", "content_type": 21}}, {"pk": 66, "model": "auth.permission", "fields": {"codename": "delete_domainalias", "name": "Can delete domain alias", "content_type": 21}}, {"pk": 67, "model": "auth.permission", "fields": {"codename": "view_domaliases", "name": "View domain aliases", "content_type": 21}}, {"pk": 76, "model": "auth.permission", "fields": {"codename": "add_extension", "name": "Can add extension", "content_type": 24}}, {"pk": 77, "model": "auth.permission", "fields": {"codename": "change_extension", "name": "Can change extension", "content_type": 24}}, {"pk": 78, "model": "auth.permission", "fields": {"codename": "delete_extension", "name": "Can delete extension", "content_type": 24}}, {"pk": 68, "model": "auth.permission", "fields": {"codename": "add_mailbox", "name": "Can add mailbox", "content_type": 22}}, {"pk": 69, "model": "auth.permission", "fields": {"codename": "change_mailbox", "name": "Can change mailbox", "content_type": 22}}, {"pk": 70, "model": "auth.permission", "fields": {"codename": "delete_mailbox", "name": "Can delete mailbox", "content_type": 22}}, {"pk": 71, "model": "auth.permission", "fields": {"codename": "view_mailboxes", "name": "View mailboxes", "content_type": 22}}, {"pk": 56, "model": "auth.permission", "fields": {"codename": "add_objectdates", "name": "Can add object dates", "content_type": 19}}, {"pk": 57, "model": "auth.permission", "fields": {"codename": "change_objectdates", "name": "Can change object dates", "content_type": 19}}, {"pk": 58, "model": "auth.permission", "fields": {"codename": "delete_objectdates", "name": "Can delete object dates", "content_type": 19}}, {"pk": 25, "model": "auth.permission", "fields": {"codename": "add_maddr", "name": "Can add maddr", "content_type": 9}}, {"pk": 26, "model": "auth.permission", "fields": {"codename": "change_maddr", "name": "Can change maddr", "content_type": 9}}, {"pk": 27, "model": "auth.permission", "fields": {"codename": "delete_maddr", "name": "Can delete maddr", "content_type": 9}}, {"pk": 28, "model": "auth.permission", "fields": {"codename": "add_mailaddr", "name": "Can add mailaddr", "content_type": 10}}, {"pk": 29, "model": "auth.permission", "fields": {"codename": "change_mailaddr", "name": "Can change mailaddr", "content_type": 10}}, {"pk": 30, "model": "auth.permission", "fields": {"codename": "delete_mailaddr", "name": "Can delete mailaddr", "content_type": 10}}, {"pk": 34, "model": "auth.permission", "fields": {"codename": "add_msgrcpt", "name": "Can add msgrcpt", "content_type": 12}}, {"pk": 35, "model": "auth.permission", "fields": {"codename": "change_msgrcpt", "name": "Can change msgrcpt", "content_type": 12}}, {"pk": 36, "model": "auth.permission", "fields": {"codename": "delete_msgrcpt", "name": "Can delete msgrcpt", "content_type": 12}}, {"pk": 31, "model": "auth.permission", "fields": {"codename": "add_msgs", "name": "Can add msgs", "content_type": 11}}, {"pk": 32, "model": "auth.permission", "fields": {"codename": "change_msgs", "name": "Can change msgs", "content_type": 11}}, {"pk": 33, "model": "auth.permission", "fields": {"codename": "delete_msgs", "name": "Can delete msgs", "content_type": 11}}, {"pk": 37, "model": "auth.permission", "fields": {"codename": "add_policy", "name": "Can add policy", "content_type": 13}}, {"pk": 38, "model": "auth.permission", "fields": {"codename": "change_policy", "name": "Can change policy", "content_type": 13}}, {"pk": 39, "model": "auth.permission", "fields": {"codename": "delete_policy", "name": "Can delete policy", "content_type": 13}}, {"pk": 40, "model": "auth.permission", "fields": {"codename": "add_quarantine", "name": "Can add quarantine", "content_type": 14}}, {"pk": 41, "model": "auth.permission", "fields": {"codename": "change_quarantine", "name": "Can change quarantine", "content_type": 14}}, {"pk": 42, "model": "auth.permission", "fields": {"codename": "delete_quarantine", "name": "Can delete quarantine", "content_type": 14}}, {"pk": 43, "model": "auth.permission", "fields": {"codename": "add_users", "name": "Can add users", "content_type": 15}}, {"pk": 44, "model": "auth.permission", "fields": {"codename": "change_users", "name": "Can change users", "content_type": 15}}, {"pk": 45, "model": "auth.permission", "fields": {"codename": "delete_users", "name": "Can delete users", "content_type": 15}}, {"pk": 46, "model": "auth.permission", "fields": {"codename": "add_wblist", "name": "Can add wblist", "content_type": 16}}, {"pk": 47, "model": "auth.permission", "fields": {"codename": "change_wblist", "name": "Can change wblist", "content_type": 16}}, {"pk": 48, "model": "auth.permission", "fields": {"codename": "delete_wblist", "name": "Can delete wblist", "content_type": 16}}, {"pk": 4, "model": "auth.permission", "fields": {"codename": "add_group", "name": "Can add group", "content_type": 2}}, {"pk": 5, "model": "auth.permission", "fields": {"codename": "change_group", "name": "Can change group", "content_type": 2}}, {"pk": 6, "model": "auth.permission", "fields": {"codename": "delete_group", "name": "Can delete group", "content_type": 2}}, {"pk": 10, "model": "auth.permission", "fields": {"codename": "add_message", "name": "Can add message", "content_type": 4}}, {"pk": 11, "model": "auth.permission", "fields": {"codename": "change_message", "name": "Can change message", "content_type": 4}}, {"pk": 12, "model": "auth.permission", "fields": {"codename": "delete_message", "name": "Can delete message", "content_type": 4}}, {"pk": 1, "model": "auth.permission", "fields": {"codename": "add_permission", "name": "Can add permission", "content_type": 1}}, {"pk": 2, "model": "auth.permission", "fields": {"codename": "change_permission", "name": "Can change permission", "content_type": 1}}, {"pk": 3, "model": "auth.permission", "fields": {"codename": "delete_permission", "name": "Can delete permission", "content_type": 1}}, {"pk": 55, "model": "auth.permission", "fields": {"codename": "view_permissions", "name": "View permissions", "content_type": 1}}, {"pk": 7, "model": "auth.permission", "fields": {"codename": "add_user", "name": "Can add user", "content_type": 3}}, {"pk": 8, "model": "auth.permission", "fields": {"codename": "change_user", "name": "Can change user", "content_type": 3}}, {"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": 49, "model": "auth.permission", "fields": {"codename": "add_parameter", "name": "Can add parameter", "content_type": 17}}, {"pk": 50, "model": "auth.permission", "fields": {"codename": "change_parameter", "name": "Can change parameter", "content_type": 17}}, {"pk": 51, "model": "auth.permission", "fields": {"codename": "delete_parameter", "name": "Can delete parameter", "content_type": 17}}, {"pk": 52, "model": "auth.permission", "fields": {"codename": "add_userparameter", "name": "Can add user parameter", "content_type": 18}}, {"pk": 53, "model": "auth.permission", "fields": {"codename": "change_userparameter", "name": "Can change user parameter", "content_type": 18}}, {"pk": 54, "model": "auth.permission", "fields": {"codename": "delete_userparameter", "name": "Can delete user parameter", "content_type": 18}}, {"pk": 82, "model": "auth.permission", "fields": {"codename": "add_alias", "name": "Can add alias", "content_type": 26}}, {"pk": 83, "model": "auth.permission", "fields": {"codename": "change_alias", "name": "Can change alias", "content_type": 26}}, {"pk": 84, "model": "auth.permission", "fields": {"codename": "delete_alias", "name": "Can delete alias", "content_type": 26}}, {"pk": 88, "model": "auth.permission", "fields": {"codename": "add_arhistoric", "name": "Can add a rhistoric", "content_type": 28}}, {"pk": 89, "model": "auth.permission", "fields": {"codename": "change_arhistoric", "name": "Can change a rhistoric", "content_type": 28}}, {"pk": 90, "model": "auth.permission", "fields": {"codename": "delete_arhistoric", "name": "Can delete a rhistoric", "content_type": 28}}, {"pk": 85, "model": "auth.permission", "fields": {"codename": "add_armessage", "name": "Can add a rmessage", "content_type": 27}}, {"pk": 86, "model": "auth.permission", "fields": {"codename": "change_armessage", "name": "Can change a rmessage", "content_type": 27}}, {"pk": 87, "model": "auth.permission", "fields": {"codename": "delete_armessage", "name": "Can delete a rmessage", "content_type": 27}}, {"pk": 79, "model": "auth.permission", "fields": {"codename": "add_transport", "name": "Can add transport", "content_type": 25}}, {"pk": 80, "model": "auth.permission", "fields": {"codename": "change_transport", "name": "Can change transport", "content_type": 25}}, {"pk": 81, "model": "auth.permission", "fields": {"codename": "delete_transport", "name": "Can delete transport", "content_type": 25}}, {"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": 22, "model": "auth.permission", "fields": {"codename": "add_migrationhistory", "name": "Can add migration history", "content_type": 8}}, {"pk": 23, "model": "auth.permission", "fields": {"codename": "change_migrationhistory", "name": "Can change migration history", "content_type": 8}}, {"pk": 24, "model": "auth.permission", "fields": {"codename": "delete_migrationhistory", "name": "Can delete migration history", "content_type": 8}}, {"pk": 1, "model": "auth.group", "fields": {"name": "DomainAdmins", "permissions": [72, 73, 74, 75, 62, 64, 65, 66, 67, 68, 69, 70, 71]}}, {"pk": 1, "model": "auth.user", "fields": {"username": "admin", "first_name": "", "last_name": "", "is_active": true, "is_superuser": true, "is_staff": true, "last_login": "2011-11-18 16:04:36", "groups": [], "user_permissions": [], "password": "sha1$6e7b5$10b2f6564eef0eeb8085887b21596865998475f0", "email": "admin@modoboa.state-of-mind.de", "date_joined": "2011-11-18 16:03:39"}}, {"pk": 2, "model": "auth.user", "fields": {"username": "admin@demo.local", "first_name": "Test domain admin", "last_name": "", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2011-11-18 16:05:27", "groups": [1], "user_permissions": [], "password": "!", "email": "admin@demo.local", "date_joined": "2011-11-18 16:06:01"}}, {"pk": 3, "model": "auth.user", "fields": {"username": "user@demo.local", "first_name": "Test", "last_name": "user", "is_active": true, "is_superuser": false, "is_staff": false, "last_login": "2011-11-18 16:05:48", "groups": [], "user_permissions": [], "password": "!", "email": "user@demo.local", "date_joined": "2011-11-18 16:05:48"}}] \ No newline at end of file diff --git a/demo/__init__.py b/demo/__init__.py index 98aa3b410..24e439289 100755 --- a/demo/__init__.py +++ b/demo/__init__.py @@ -28,5 +28,5 @@ def menu(**kwargs): } ] -if 'demo' in settings.INSTALLED_APPS: +if 'modoboa.demo' in settings.INSTALLED_APPS: events.register("UserMenuDisplay", menu) From d23923a248bcd46d942c582632634b6b3f8169f0 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 18 Nov 2011 23:42:31 +0100 Subject: [PATCH 4/4] If the demo application is activated, an announcement now appears on the login page to inform visitors on how to use the demo. --- auth/views.py | 4 +- demo/__init__.py | 8 +++ demo/templates/demo/login_announcement.html | 13 +++++ doc/plugin_api.rst | 13 ++++- extensions/stats/grapher.py | 2 +- lib/events.py | 4 +- static/css/login.css | 58 ++++++++++++++------- templates/registration/login.html | 8 +-- 8 files changed, 83 insertions(+), 27 deletions(-) create mode 100644 demo/templates/demo/login_announcement.html diff --git a/auth/views.py b/auth/views.py index fc424e48b..6a08f5d7d 100755 --- a/auth/views.py +++ b/auth/views.py @@ -39,9 +39,11 @@ def dologin(request): error = _("Your username and password didn't match. Please try again.") else: form = LoginForm() + next = request.GET.has_key("next") and request.GET["next"] or None return render_to_response("registration/login.html", { - "form" : form, "error" : error, "next" : next + "form" : form, "error" : error, "next" : next, + "annoucements" : events.raiseQueryEvent("GetAnnouncement", target="loginpage") }, context_instance=RequestContext(request)) def dologout(request): diff --git a/demo/__init__.py b/demo/__init__.py index 24e439289..c6fcc4bad 100755 --- a/demo/__init__.py +++ b/demo/__init__.py @@ -2,6 +2,7 @@ from django.conf import settings from django.core.urlresolvers import reverse from django.utils.translation import ugettext_noop as _ +from django.template.loader import render_to_string from modoboa.lib import events from modoboa.lib.webutils import static_url @@ -28,5 +29,12 @@ def menu(**kwargs): } ] +def announcement(**kwargs): + if kwargs["target"] == "loginpage": + txt = render_to_string("demo/login_announcement.html") + return [txt] + return "" + if 'modoboa.demo' in settings.INSTALLED_APPS: events.register("UserMenuDisplay", menu) + events.register("GetAnnouncement", announcement) diff --git a/demo/templates/demo/login_announcement.html b/demo/templates/demo/login_announcement.html new file mode 100644 index 000000000..7513ab318 --- /dev/null +++ b/demo/templates/demo/login_announcement.html @@ -0,0 +1,13 @@ +{% load i18n %} +{% blocktrans %} +

Welcome to the online demo!

+

Warning: the demo's concent is resetted every two hours.

+

To try the demo, the following users are available (username/password):

+
    +
  • A super administrator : admin/password
    • +
  • A domain administrator : admin@demo.local/admin
    • +
  • A simple user : user@demo.local/user
    • +
+

Please report any issue of give any suggestion to + the mailing list.

+{% endblocktrans %} diff --git a/doc/plugin_api.rst b/doc/plugin_api.rst index 50e5f9533..ba48a4036 100644 --- a/doc/plugin_api.rst +++ b/doc/plugin_api.rst @@ -126,7 +126,7 @@ that corresponds to the ``Request`` object used inside the associated view function. UserLogout -__________ +---------- Raised when a user logs out. This event provides a ``request`` argument that corresponds to the ``Request`` object used inside the associated @@ -245,6 +245,17 @@ ExtDisabled Raised just after an extension has been disabled. The Extension object is available inside the ``ext`` keyword argument. +GetAnnouncement +--------------- + +Some places in the interface let plugins add their own announcement +(ie. message). A keyword argument ``target`` is provided to registered +callbacks and indicates the place where the announcement will appear: + +* ``loginpage`` : corresponds to the login page + +Callbacks listening to this event must return a list of string. + Parameters ========== diff --git a/extensions/stats/grapher.py b/extensions/stats/grapher.py index ad52da760..2dfd5d3e7 100644 --- a/extensions/stats/grapher.py +++ b/extensions/stats/grapher.py @@ -3,7 +3,7 @@ import os import time import datetime -import rrdtool +#import rrdtool from django.utils.translation import ugettext as _ from modoboa.lib import parameters diff --git a/lib/events.py b/lib/events.py index 460e35276..631486e26 100644 --- a/lib/events.py +++ b/lib/events.py @@ -22,7 +22,9 @@ events = ["CreateDomain", "ExtDisabled", "UserLogin", - "UserLogout"] + "UserLogout", + + "GetAnnouncement"] callbacks = {} diff --git a/static/css/login.css b/static/css/login.css index 798736283..70fd8145c 100644 --- a/static/css/login.css +++ b/static/css/login.css @@ -7,26 +7,10 @@ html, body { } #loginbox { - margin: 100px auto; - width: 610px; - padding-bottom: 15px; - background: white; - - border: 5px solid #333; - /*-moz-box-shadow: 0 10px 30px #222;*/ - -webkit-box-shadow: 0 10px 30px #222; - -moz-border-radius: 10px; - -webkit-border-radius: 5px; -} - -#loginbox h2 { - margin: 30px 10px 0 10px; - font-size: small; -} - -#loginbox h3 { - font-size: small; - text-align: center; + margin: 100px auto 10px auto; + padding: 0 0 15px 0; + font-size: 1em; + width: 630px; } #logo { @@ -46,6 +30,40 @@ html, body { width: 300px; } +.roundedbox { + margin: 10px auto; + padding: 10px; + width: 610px; + background: white; + font-size: 1.1em; + + border: 5px solid #333; + border-radius: 10px; +} + +.roundedbox h1 { + padding: 0; + margin: 0; + font-size: 1.2em; + text-align: center; +} + +.roundedbox h2 { + margin: 30px 10px 0 10px; + font-size: small; +} + +.roundedbox h3 { + font-size: small; + text-align: center; +} + +.roundedbox a, a:visited { + font-weight: bold; + color: black; + text-decoration: none; +} + .spacer { clear: both; } diff --git a/templates/registration/login.html b/templates/registration/login.html index ed8034ab9..08af52fbc 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -16,7 +16,7 @@ -
+
+ {% for annoucement in annoucements %} +
{{ annoucement|safe }}
+ {% endfor %}