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

controllers/msg.py

@@ -303,6 +303,25 @@ def inbound_email_settings():
     return s3_rest_controller()
 
 
+# -----------------------------------------------------------------------------
+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():

modules/eden/menus.py

@@ -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")(