Permalink
Browse files

Merge branch 'master' of git://github.com/ashwyn/eden

  • Loading branch information...
2 parents d364aa6 + a722c88 commit 128984d4912bf1937b9a5f5e2e49740780e52da2 @flavour committed Apr 17, 2012
Showing with 20 additions and 0 deletions.
  1. +19 −0 controllers/msg.py
  2. +1 −0 modules/eden/menus.py
View
@@ -304,6 +304,25 @@ def inbound_email_settings():
# -----------------------------------------------------------------------------
+def email_inbox():
+
+ """
+ RESTful CRUD controller for the Email Inbox
+ - all Inbound Email Messages go here
+ """
+
+ if not auth.s3_logged_in():
+ session.error = T("Requires Login!")
+ redirect(URL(c="default", f="user", args="login"))
+
+ tablename = "msg_email_inbox"
+ table = s3db[tablename]
+
+ s3mgr.configure(tablename, listadd=False)
+ return s3_rest_controller()
+
+
+# -----------------------------------------------------------------------------
@auth.s3_requires_membership(1)
def modem_settings():
View
@@ -1077,6 +1077,7 @@ def msg(self):
M("List/Add", f="group"),
M("Group Memberships", f="group_membership"),
),
+ M("Email InBox", f="email_inbox"),
M("Log", f="log"),
M("Outbox", f="outbox"),
M("Search Twitter Tags", f="twitter_search")(

0 comments on commit 128984d

Please sign in to comment.